diff --git a/.editorconfig b/.editorconfig
index 8f960391..6c76c202 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,3 +8,7 @@ end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
+
+[{package.json,.travis.yml,.jshintrc}]
+indent_style = space
+indent_size = 2
diff --git a/.jshintrc b/.jshintrc
index 2c3f7d32..e40e7d81 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -1,14 +1,14 @@
 {
-    "browser": true,
-    "curly": true,
-    "eqeqeq": false,
-    "loopfunc": false,
-    "noarg": true,
-    "trailing": true,
-    "undef": true,
-    "unused": false,
+  "browser": true,
+  "curly": true,
+  "eqeqeq": false,
+  "loopfunc": false,
+  "noarg": true,
+  "trailing": true,
+  "undef": true,
+  "unused": false,
 
-    "globals": {
-        "OpenSeadragon": true
-    }
+  "globals": {
+    "OpenSeadragon": true
+  }
 }
diff --git a/README.md b/README.md
index 75fc5c92..efb8b4be 100644
--- a/README.md
+++ b/README.md
@@ -73,7 +73,7 @@ The report shows up at `coverage/html/index.html` viewable in a browser.
 
 OpenSeadragon is truly a community project; we welcome your involvement!
 
-When contributing, please attempt to match the code style already in the codebase. Note that we use four spaces per indentation stop. For more thoughts on code style, see https://github.com/rwldrn/idiomatic.js/.
+When contributing, please attempt to match the code style already in the codebase. Note that we use four spaces per indentation stop. For easier setup you can also install [EditorConfig](http://editorconfig.org/) if your IDE is supported. For more thoughts on code style, see [idiomatic.js](https://github.com/rwldrn/idiomatic.js/).
 
 When fixing bugs and adding features, when appropriate please also:
 
@@ -86,6 +86,6 @@ If you're new to open source in general, check out [GitHub's open source intro g
 
 ## License
 
-OpenSeadragon is released under the New BSD license.  For details, see the file LICENSE.txt.
+OpenSeadragon is released under the New BSD license. For details, see the file LICENSE.txt.
 
 [![Build Status](https://secure.travis-ci.org/openseadragon/openseadragon.png?branch=master)](http://travis-ci.org/openseadragon/openseadragon)