Maven Attempt 1

.gitignore

@@ -1,20 +1,31 @@
-# Eclipse stuff
+# Eclipse
 /.classpath
 /.project
 /.settings
+/*.jardesc
+
+# IntelliJ
+*.iml
+*.ipr
+*.iws
+.idea/
 
 # NetBeans
 /nbproject
-/build.xml
 
 # vim
 .*.sw[a-p]
 
+# Maven
+/build.xml
+/target
+/dependency-reduced-pom.xml
+
 # various other potential build files
 /build
 /bin
 /dist
-/*.jardesc
+/manifest.mf
 
 # Mac filesystem dust
-.DS_Store
+.DS_Store