diff --git a/.gitignore b/.gitignore
index c0acf10823..cf94c5f85d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,24 +1,66 @@
-docs_build/
+# Hypha
 /hypha/static_compiled
-__coverage__/
+
+# Django
+*.log
+*.mo
+*.pot
 *.pyc
-.DS_Store
-*.swp
-/venv/
-/static/
-/media/
-/tmp/
-/.vagrant/
-/Vagrantfile.local
+__pycache__
+db.sqlite3
+media/
+static/
+tmp/
+
+# Node
 node_modules/
-/npm-debug.log
-/.idea/
-.cache/
-.eslintcache
+npm-debug.log
+
+# Backup files
+*.bak
+
+# If you are using PyCharm
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# AWS User-specific
+.idea/**/aws.xml
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Python
+*.py[cod]
+*$py.class
 
 # Distribution / packaging
 .Python
-env/
 build/
 develop-eggs/
 dist/
@@ -31,20 +73,73 @@ parts/
 sdist/
 var/
 wheels/
+*.whl
 *.egg-info/
 .installed.cfg
 *.egg
-.coverage
-htmlcov/
+*.manifest
+*.spec
 
-# Cache
-.mypy_cache/
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
 .pytest_cache/
-__pycache__/
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+__coverage__/
 
-# Compiled language files
-*.mo
+# macOS
+.DS_Store
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# celery
+celerybeat-schedule.*
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
 .env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# mkdocs documentation
+docs_build/
+
+# mypy
+.mypy_cache/
+
+# Sublime Text
+*.tmlanguage.cache
+*.tmPreferences.cache
+*.stTheme.cache
+*.sublime-workspace
+*.sublime-project
+
+# sftp configuration file
+sftp-config.json
+
+# Package control specific files Package
+Control.last-run
+Control.ca-list
+Control.ca-bundle
+Control.system-ca-bundle
+GitHub.sublime-settings
 
 # Visual Studio Code
 .vscode/*
@@ -53,12 +148,10 @@ __pycache__/
 !.vscode/launch.json
 !.vscode/extensions.json
 !.vscode/*.code-snippets
-
-# Zed
-.zed/
-
-# Local History for Visual Studio Code
-.history/
+.history
 
 # Built Visual Studio Code Extensions
 *.vsix
+
+# Zed
+.zed/