diff --git a/.gitignore b/.gitignore
index 38ad09099226bb6e730cb9c6083ba8a32ab6e4e3..2da5c5c5d2af040c6cb504d85206ba790701eb96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,36 @@
+# Numerous always-ignore extensions
+*.diff
+*.err
+*.orig
+*.log
+*.rej
+*.swo
+*.swp
+*.vi
+*~
+*.sass-cache
+
+# OS or Editor folders
 .DS_Store
-js/min
\ No newline at end of file
+Thumbs.db
+.cache
+.project
+.settings
+.tmproj
+*.esproj
+nbproject
+*.sublime-project
+*.sublime-workspace
+
+# Komodo
+*.komodoproject
+.komodotools
+
+# Folders to ignore
+.hg
+.svn
+.CVS
+.idea
+
+# Misc
+js/min