diff --git a/.gitignore b/.gitignore
index 997804e0..6022c6a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,33 @@
-.classpath
-.project
-bin/
-.DS_Store
-.settings
\ No newline at end of file
+# Eclipse stuff
+/.classpath
+/.project
+/.settings
+
+# netbeans
+/nbproject
+
+# we use maven!
+/build.xml
+
+# maven
+/target
+
+# vim
+.*.sw[a-p]
+
+# various other potential build files
+/build
+/bin
+/dist
+/manifest.mf
+
+/world
+
+# Mac filesystem dust
+/.DS_Store
+
+# intellij
+*.iml
+*.ipr
+*.iws
+.idea/
\ No newline at end of file