diff --git a/.gitignore b/.gitignore
index efe7e6e621bb44ff3b61c296ce841445f5353451..6bbc3ffa11b5ac3f4e9acca1b3eeeb70d886e60d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,23 @@
-.keep_in_git
+/build/*
+!/build/.gitkeep
+!.gitkeep
+!.gitignore
 
-/build*
-
-source/RobotAPI/Test.h
+source/*/Test.h
 
 *.bak
 *#
 .#*
 *~
+*.swp
+.*.kate-swp
+.*.swo
+*.pyc
 
 .DS_Store
 CMakeFiles
 CMakeCache.txt
+CMakeLists.txt.user
 
 *.o
 *.os
@@ -22,3 +28,18 @@ CMakeCache.txt
 *.dylib
 moc_*
 
+# eclipse stuff
+.project
+.pydevproject
+.settings
+.metadata
+.cproject
+.project
+
+# MemoryX
+.cache
+mongod.log*
+data/db/
+data/dbdump/
+
+