Cleanup of .gitignore

.gitignore

@@ -2,21 +2,30 @@
 .classpath
 .project
 .settings
-.gitignore
 
 # maven
 target/
 */src/main/java/META-INF/
 *.versionsBackup
+*.releaseBackup
 bin/
 
 # common junk
 *.log
-*.swp
 *.diff
 *.patch
+*.sw[a-p]
+*.bak
+*.backup
+*.debug
+*.dump
 
-# intellij
+# vim 
+.*.sw[a-p]
+*~
+~*
+
+# intellij / android studio
 *.iml
 *.ipr
 *.iws
@@ -32,12 +41,5 @@ bin/
 # netbeans
 /nbproject
 
-# vim
-.*.sw[a-p]
-
 # merge tooling
 *.orig
-
-#maven
-*.versionsBackup
-*.releaseBackup