diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..909968913
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,11 @@
+# http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
diff --git a/.gitignore b/.gitignore
index 3bf3160e2..5e90c60cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,19 @@ bower_components
 # OS
 .DS_Store
 
+# IDEs/Editor files
+.idea/*
+*.iml
+*.sublime-*
+projectFilesBackup
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
+*.un~
+Session.vim
+.netrwhist
+.vimrc
+*~
+
 # Builds
 keys.txt
 export.sh