diff --git a/.editorconfig b/.editorconfig
index 636ceea4c0..ed90a06898 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,36 +1,25 @@
 # EditorConfig is awesome: http://EditorConfig.org
 
-# Howto with your editor:
-#   Sublime: https://github.com/sindresorhus/editorconfig-sublime
+# How-to with your editor: http://editorconfig.org/#download
 
 # top-most EditorConfig file
 root = true
 
 # Unix-style newlines with a newline ending every file
-[**]
+[*]
 end_of_line = lf
+indent_style = tab
 insert_final_newline = true
 
-# Standard at: https://github.com/felixge/node-style-guide 
-[**.js, **.json]
+[{Dockerfile,Procfile}]
+trim_trailing_whitespace = true
+
+# Standard at: https://github.com/felixge/node-style-guide
+[{*.js,*.json}]
 trim_trailing_whitespace = true
-indent_style = tab
 quote_type = single
 curly_bracket_next_line = false
 spaces_around_operators = true
 space_after_control_statements = true
 space_after_anonymous_functions = false
 spaces_in_brackets = false
-
-# No Standard.  Please document a standard if different from .js
-[**.yml, **.html, **.css]
-trim_trailing_whitespace = true
-indent_style = tab
-
-# No standard.  Please document a standard if different from .js
-[**.md]
-indent_style = tab
-
-# Standard at: 
-[Makefile]
-indent_style = tab
\ No newline at end of file