diff --git a/.gitignore b/.gitignore
index c03acb2b..236f02ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,48 @@
-data/*
-*.pyc
-*.egg/
-*.egg-info/
+*.py[cod]
+
+# vi(m) swap files:
+*.sw?
+
+# C extensions
+*.so
+
+# Packages
 .cache/
+*.egg
+*.eggs
+*.egg-info
+dist
+build
+eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib
+lib64
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
 .coverage
-.eggs/
-build/
-dist/
+.tox
+nosetests.xml
 coverage.xml
+htmlcov
 junit.xml
+features/output
+dummy
+
+# Translations
+*.mo
+
+# Mr Developer
+.mr.developer.cfg
+.project
+.pydevproject
+
 pgpass
 scm-source.json