diff --git a/.gitignore b/.gitignore
index d43ff47..205bc24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,33 @@
+# 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
/release
-/agitar
\ No newline at end of file
+/agitar
+/dist
+/manifest.mf
+
+# Mac filesystem dust
+/.DS_Store
+
+# intellij
+*.iml
+*.ipr
+*.iws
+.idea/
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 0a0298b..cf0d23f 100644
--- a/build.xml
+++ b/build.xml
@@ -5,15 +5,13 @@
-
-
-
+