Merge branch 'develop' into macata#7

Author: DazedNConfused-

.gitignore

@@ -4,10 +4,7 @@ target/
 !**/src/test/**/target/
 
 ### IntelliJ IDEA ###
-.idea/modules.xml
-.idea/jarRepositories.xml
-.idea/compiler.xml
-.idea/libraries/
+.idea/
 *.iws
 *.iml
 *.ipr
@@ -45,4 +42,5 @@ saves
 backups
 .macatalauncher
 trashed
-userdir
+userdir
+mods