diff --git a/.gitignore b/.gitignore
index 880f5bd09..072996824 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,70 +1,34 @@
-*.py[cod]
+.vagrant/
+node_modules/
+.DS_store
+*.pyc
 
-#vi files
+# vi
 *.swp
 
-# Installer logs
-pip-log.txt
-
-# logs
-test.log
-treeherder*.log
-treeherder.log.*
-LOGFILE
-supervisor*.log
-
-# Unit test / coverage reports
-.coverage
-.tox
-nosetests.xml
-
 # pytest cache
 .cache/
 
-# Translations
-*.mo
-
-#pycharm files
+# PyCharm
 .idea/
 *.iml
 
-# Mr Developer
-.mr.developer.cfg
-.project
-.pydevproject
-.DS_store
-.vagrant
-
-#local settings
+# Treeherder-specific
 deployment/update/commander_settings.py
+dist/
+docs/_build/
 treeherder/config/settings_local.py
+treeherder/etl/data/credentials.json
+treeherder/media/
+treeherder/static/
+treeherder/webapp/log_cache/
 ui/js/config/local.conf.js
 
-htmlcov/
-
-# Minified/built UI files generated by the `grunt build`.
-dist/
-
-#static files in deployment
-treeherder/static/
-
-#media files in deployment
-treeherder/media/
-
-#etl data files
-treeherder/etl/data/credentials.json
-
-#docs build directory
-docs/_build/
-
-#supervisor
+# supervisor
 .nfs*
 *.pid
 
-treeherder/webapp/log_cache
+# Celery
 celerybeat-schedule
 
-node_modules
-.tmp/
-
 !.gitkeep