diff --git a/.gitignore b/.gitignore
index 1c2bef0..ba4294c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,64 @@
-# java
+#################
+## Misc
+
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+.settings
+local.properties
+.loadpath
+
+# External tool builders
+.externalToolBuilders/
+
+## Maven stuff
+
 target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+/workspace/
+
+## IDEA configs
+
+*.iml
+/idea/
+
+## Eclipse configs
+
 .project
 .classpath
-.settings/
\ No newline at end of file
+.settings/
+
+## Eclipse PDE
+*.product.launch
+
+# Dev executables
+
+.cmd
+.bat
+
+#############
+## Windows detritus
+#############
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Mac crap
+.DS_Store