diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..72bb6972c
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,19 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[**.css]
+indent_style = space
+indent_size = 2
+
+[**.php]
+indent_style = space
+indent_size = 4
diff --git a/.gitignore b/.gitignore
index 5c73ae6be..8c57c5ce4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,11 @@ nbproject
 .ircbot.alert
 .metadata_never_index
 *.swp
+
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+.Spotlight-V100
+.Trashes
+Thumbs.db