merged .gitignore with github defaults

.gitignore

@@ -1,21 +1,90 @@
-*~
-*.pyc
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+tmp/
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# OS Related
 .DS_Store
-deploy
-deploy/*
+
 *.cprof
 *.profile
 *.log
+
 pylint*
+
+# Editors
+*~
 *.tmproj
-test_site
-dist
-build
-*egg*
+.tm_properties
 .idea
 PYSMELLTAGS
-.noseids
-*.tar.gz
+
+# Hyde specific
 .hyde_deps
+deploy
+deploy/*
+test_site
+dist
 src
-.tm_properties
+
+
+.noseids
+.coverage
+
+*.tar.gz