Merge a5f0e4b5f2 into 8f6173cd8a

.editorconfig

@@ -0,0 +1,20 @@
+# http://editorconfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+end_of_line = lf
+charset = utf-8
+
+# Docstrings and comments use max_line_length = 79
+[*.py]
+max_line_length = 119
+
+# Minified JavaScript files shouldn't be changed
+[**.min.js]
+indent_style = ignore
+insert_final_newline = ignore

.gitignore

@@ -16,3 +16,4 @@ coverage.*
 !.gitignore
 !.travis.yml
 !.isort.cfg
+!.editorconfig