diff --git a/.gitignore b/.gitignore
index a3830700f..8f01937ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,163 @@
-*.*~
-*.pyc
-vendor/*
-composer.phar
-*~$
-*\.log.*
-**/*.egg-info/*
-**/build/*
-**/dist/*
-*~
-/airtime_mvc/tests/test_results.xml
-/tests/results.html
-/tests/*.jar
-VERSION
-airtime_mvc/tests/log/*.log
-.vagrant/
+## Custom .gitignore
+################################################################################
+
 .DS_Store
 .idea/
-/docs/_site/*
-/docs/.jekyll-cache/*
-/docs/.gems/*
-Gemfile.lock
-api.log
+.vagrant/
+*.log
+*~
+VERSION
+
+## Github Composer .gitignore
+## See https://github.com/github/gitignore/blob/master/Composer.gitignore
+################################################################################
+
+composer.phar
+/vendor/
+
+# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
+# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
+# composer.lock
+
+## Github Python .gitignore
+## See https://github.com/github/gitignore/blob/master/Python.gitignore
+################################################################################
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# 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/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
diff --git a/airtime_mvc/.gitignore b/airtime_mvc/.gitignore
new file mode 100644
index 000000000..b74fe9c95
--- /dev/null
+++ b/airtime_mvc/.gitignore
@@ -0,0 +1,6 @@
+## Custom .gitignore
+################################################################################
+
+/tests/*.jar
+/tests/results.html
+/tests/test_results.xml
diff --git a/docs/.gitignore b/docs/.gitignore
new file mode 100644
index 000000000..5e3dc5255
--- /dev/null
+++ b/docs/.gitignore
@@ -0,0 +1,11 @@
+## Custom .gitignore
+################################################################################
+
+## Github Jekyll .gitignore
+## See https://github.com/github/gitignore/blob/master/Jekyll.gitignore
+################################################################################
+
+_site/
+.sass-cache/
+.jekyll-cache/
+.jekyll-metadata