diff --git a/.gitignore b/.gitignore
index b24d71e2..22173e7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,17 +23,24 @@ dist/
 target/
 dist/
 
-# JetBrains IDE
+# IDE and editor files
 .idea/
+*.sublime-*
+*.swp
+.vscode/
 
 # Unit test reports
 TEST*.xml
 
-# Generated by MacOS
+# OS X
 .DS_Store
+.AppleDouble
+.LSOverride
 
-# Generated by Windows
+# Windows image file caches
 Thumbs.db
+ehthumbs.db
+Desktop.ini
 
 # Applications
 *.app
@@ -48,3 +55,42 @@ Thumbs.db
 *.mov
 *.wmv
 
+#-------------------------
+# Environment Files
+#-------------------------
+# These should never be under version control,
+# as it poses a security risk.
+.env
+.vagrant
+
+#-------------------------
+# Temporary Files
+#-------------------------
+writable/cache/*
+!writable/cache/index.html
+
+writable/logs/*
+!writable/logs/index.html
+
+writable/session/*
+!writable/session/index.html
+
+writable/uploads/*
+!writable/uploads/index.html
+
+writable/debugbar/*
+!writable/debugbar/.gitkeep
+
+writable/**/*.db
+writable/**/*.sqlite
+
+php_errors.log
+
+
+#-------------------------
+# Composer
+#-------------------------
+vendor/
+composer.lock
+
+tests
\ No newline at end of file