Merge "Add a simple .editorconfig"