diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..f44e7c16
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+# This file is for unifying the coding style for different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
diff --git a/.gitignore b/.gitignore
index 27856e10..f939b8e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,20 @@
+# Laravel
 /bootstrap/compiled.php
 /vendor
-/node_modules
-/app/assets/bower_components
-composer.phar
+/workbench
+
+# Configuration
 .env.*.php
 .env.php
-.DS_Store
-Thumbs.db
 config.codekit
-npm-debug.log
+
+# Assets development
+/node_modules
+/app/assets/bower_components
+public/css/
 public/js/
-public/css/
\ No newline at end of file
+
+# Packages
+npm-debug.log
+.vagrant/
+tests/_output/*