Merge pull request #2381 from akhoury/patch-3

could you explicitly specify the last 4 rules?

.editorconfig

@@ -1,4 +1,8 @@
 root = true
 
-[*.js, *.css, *.tpl]
+[*.js, *.css, *.tpl, *.json]
 indent_style = tab
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = false