diff --git a/.gitignore b/.gitignore
index b80d794..f24ded0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,80 @@
+# Subversion
 .svn
-*.class
+
+## IDEs ##
+
+# Android Studio
+*.apk
+*.ap_
+*.dex
+bin/
+gen/
+out/
+.navigation/
+proguard/
+/local.properties
+/captures
+
+# IntelliJ
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# Netbeans IDE
+nbproject/
+nbactions.xml
+
+# Eclipse stuff
+.classpath
+.project
+.settings/
+
+# vim
+.*.sw[a-p]
+
+## Build systems ##
 
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
 
-# Package Files #
+# We use maven!
+build.xml
+
+# Maven
+dependency-reduced-pom.xml
+target/
+
+# Gradle
+!gradle-wrapper.jar
+.gradle
+build/
+gradle-app.setting
+.gradletasknamecache
+
+# Package Files
 *.jar
 *.war
 *.ear
 
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+# Various other potential build files
+*.class
+build/
+bin/
+dist/
+manifest.mf
+
+## Other files ##
+
+# Mac filesystem dust
+.DS_Store/
+
+# Logs
+*.log*
 hs_err_pid*
 
-# NetBeans Files #
-nbactions.xml
-nb-configuration.xml
+# Keystore files
+*.jks
 
-# Output folder
-target
\ No newline at end of file
+# delombok
+*/src/main/lombok