diff --git a/.gitignore b/.gitignore
index 4284dfa80..4489bce0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,23 @@
-.svn
-*~
-*.kate-swp
-.*.swp
 /node_modules/
 /vendor/
 /composer.lock
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json