diff --git a/.gitignore b/.gitignore
index 0588bd33f..cb2aeb6cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,27 @@
-.svn
 .idea/
-*~
-*.kate-swp
-.*.swp
-\#*\#
 node_modules/
 scripts/remotes/
 tests/browser/screenshots
 /vendor
 /docs
 composer.lock
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json