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