diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..bab156b63a
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,24 @@
+# http://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+
+[*.md]
+max_line_length = 0
+trim_trailing_whitespace = false
+
+[*.jade]
+max_line_length = 0
+trim_trailing_whitespace = false
+
+# Indentation override
+#[lib/**.js]
+#[{package.json,.travis.yml}]
+#[**/**.js]
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index bede42df52..0000000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,11 +0,0 @@
-// Place your settings in this file to overwrite default and user settings.
-{
-	// Controls the rendering size of tabs in characters. Accepted values: "auto", 2, 4, 6, etc. If set to "auto", the value will be guessed when a file is opened.
-	"editor.tabSize": 2,
-	// Controls if the editor will insert spaces for tabs. Accepted values:  "auto", true, false. If set to "auto", the value will be guessed when a file is opened.
-	"editor.insertSpaces": true,
-  // When enabled, will trim trailing whitespace when you save a file.
-	"files.trimTrailingWhitespace": false,
-  // Specifies the folder path containing the tsserver and lib*.d.ts files to use.
-  "typescript.tsdk": "public/docs/_examples/node_modules/typescript/lib"
-}
diff --git a/gulpfile.js b/gulpfile.js
index 2ab015cdc7..44baa44792 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -69,6 +69,7 @@ var _excludeMatchers = _excludePatterns.map(function(excludePattern){
 });
 
 var _exampleBoilerplateFiles = [
+  '.editorconfig',
   'karma.conf.js',
   'karma-test-shim.js',
   'package.json',
diff --git a/public/docs/_examples/.editorconfig b/public/docs/_examples/.editorconfig
new file mode 100644
index 0000000000..f2abacf6d3
--- /dev/null
+++ b/public/docs/_examples/.editorconfig
@@ -0,0 +1,20 @@
+# http://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+
+[*.md]
+max_line_length = 0
+trim_trailing_whitespace = false
+
+# Indentation override
+#[lib/**.js]
+#[{package.json,.travis.yml}]
+#[**/**.js]
diff --git a/public/docs/_examples/.gitignore b/public/docs/_examples/.gitignore
index 7e2250f509..d821c82bea 100644
--- a/public/docs/_examples/.gitignore
+++ b/public/docs/_examples/.gitignore
@@ -1,3 +1,4 @@
+.editorconfig
 styles.css
 typings
 typings.json
diff --git a/tools/plunker-builder/plunkerBuilder.js b/tools/plunker-builder/plunkerBuilder.js
index cb1c405de9..bf784f1e32 100644
--- a/tools/plunker-builder/plunkerBuilder.js
+++ b/tools/plunker-builder/plunkerBuilder.js
@@ -107,14 +107,16 @@ function initConfigAndCollectFileNames(configFileName) {
     }
   });
   // var defaultExcludes = [ '!**/node_modules/**','!**/typings/**','!**/tsconfig.json', '!**/*plnkr.json', '!**/*plnkr.html', '!**/*plnkr.no-link.html' ];
-  var defaultExcludes = [ 
+  var defaultExcludes = [
     '!**/typings/**',
     '!**/typings.json',
-    '!**/tsconfig.json', 
-    '!**/*plnkr.*', 
-    '!**/package.json', 
+    '!**/tsconfig.json',
+    '!**/*plnkr.*',
+    '!**/package.json',
     '!**/example-config.json',
-    '!**/*.spec.*' 
+    '!**/*.spec.*',
+    '!**/tslint.json',
+    '!**/.editorconfig'
    ];
   Array.prototype.push.apply(gpaths, defaultExcludes);
 
@@ -263,4 +265,4 @@ function escapeHtml(unsafe) {
 //      fs.writeFileSync(outputFn, html, 'utf-8' );
 //    }
 //  });
-//}
\ No newline at end of file
+//}