Merge "Simplify .gitignore"

.gitignore

@@ -1,54 +1,9 @@
-*.py[cod]
-
-# 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
+*.egg-info/
+*.eggs/
+*.pyc
 .coverage
-cover
-.tox
-nosetests.xml
-.testrepository
-.venv
-
-# Translations
-*.mo
-
-# Mr Developer
-.mr.developer.cfg
-.project
-.pydevproject
-
-# Complexity
-output/*.html
-output/*/index.html
-
-# Sphinx
-doc/build
-
-# pbr generates these
+.testrepository/
+.tox/
 AUTHORS
 ChangeLog
-
-# Editors
-*~
-.*.swp
-.*sw?
+cover/