diff --git a/.gitignore b/.gitignore
index 6debb6e..86b7d64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,54 @@
-# meld
-*.orig
+*.py[cod]
 
-# emacs
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.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
+.tox
+nosetests.xml
+.testrepository
+
+# Translations
+*.mo
+
+# Mr Developer
+.mr.developer.cfg
+.project
+.pydevproject
+
+# Complexity
+output/*.html
+output/*/index.html
+
+# Sphinx
+doc/build
+
+# pbr generates these
+AUTHORS
+ChangeLog
+
+# Editors
 *~
-\#*
-
-# vim
-.swp
-
-# python
-__pycache__
-*.pyc
+.*.swp
 
 # other
 *.ics