Combine EditorConfig rules using {...} notation
Merge pull request #2312 from treyhunner/editorconfig-fix

Use shorter EditorConfig file syntax