diff --git a/.gitignore b/.gitignore
index c0229f7..941e295 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,15 +25,22 @@ dist/
 
 # JetBrains IDE
 .idea/
+*.sublime-*
+*.swp
+.vscode/
 
 # Unit test reports
 TEST*.xml
 
 # Generated by MacOS
 .DS_Store
+.AppleDouble
+.LSOverride
 
 # Generated by Windows
 Thumbs.db
+ehthumbs.db
+Desktop.ini
 
 # Applications
 *.app
@@ -49,8 +56,10 @@ Thumbs.db
 *.wmv
 
 writable/debugbar/
+writable/debugbar/*
 !writable/debugbar/.gitkeep
-writable/session/
+writable/session/*
+!writable/session/index.html
 !writable/session/.gitkeep
 writable/logs/
 !writable/logs/.gitkeep
@@ -60,9 +69,25 @@ writable/cache/
 !writable/cache/.gitkeep
 
 
-public/uploads/
+
+php_errors.log
+
+public/uploads/*
+!public/uploads/index.html
 !public/uploads/.gitkeep
 
+writable/**/*.db
+writable/**/*.sqlite
 
-vendor
+#-------------------------
+# Composer
+#-------------------------
+!vendor/
+composer.lock
 
+tests
+
+# Don't save phpunit under version control.
+phpunit
+phpunit*.xml
+/.phpunit.*.cache
\ No newline at end of file