diff --git a/.gitignore b/.gitignore
index 937ad6b40cda..f7f8a408be13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,3 @@
-# buildout
-tools/.*
-tools/bin
-tools/develop-eggs
-tools/eggs
-tools/etc
-tools/parts
-
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -14,6 +6,8 @@ __pycache__/
 *.so
 
 # Distribution / packaging
+.Python
+env/
 bin/
 build/
 develop-eggs/
@@ -33,6 +27,7 @@ pip-log.txt
 pip-delete-this-directory.txt
 
 # Unit test / coverage reports
+htmlcov/
 .tox/
 .coverage
 .cache
@@ -45,11 +40,20 @@ coverage.xml
 # Pycharm
 .idea
 
-# Project
+# Mr Developer
+.mr.developer.cfg
 .project
 .pydevproject
-.settings/
+
+# Rope
+.ropeproject
+
+# Sphinx documentation
+docs/_build/
 
 # Backup files
 *~
 *.swp
+
+# OSX Files
+*.DS_Store