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