diff --git a/.editorconfig b/.editorconfig
index 0b008c9574..f29d257cc5 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -3,13 +3,9 @@
 root = true
 
 [*]
-indent_style = space
-indent_size = 2
-end_of_line = lf
 charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.py]
+end_of_line = lf
+indent_size = 2
 indent_style = space
-indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
diff --git a/.gitattributes b/.gitattributes
index 0c6b2fea5f..5e18facb40 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,6 +3,9 @@
 *.html  text eol=lf
 *.js    text eol=lf
 *.json  text eol=lf
-*.less  text eol=lf
+*.map   text eol=lf
 *.md    text eol=lf
+*.svg   text eol=lf
+*.txt   text eol=lf
+*.xml   text eol=lf
 *.yml   text eol=lf
diff --git a/.gitignore b/.gitignore
index 465cdb4633..b4014faf39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,42 +1,42 @@
 # Ignore docs files
-_gh_pages
-_site
-.ruby-version
+/_gh_pages/
+/site/docs/**/dist/
+
+# Ignore ruby/bundler files
+/.bundle/
+/vendor/
+/.ruby-version
 
 # Numerous always-ignore extensions
 *.diff
 *.err
-*.orig
 *.log
+*.orig
 *.rej
 *.swo
 *.swp
-*.zip
 *.vi
+*.zip
 *~
 
 # OS or Editor folders
-.DS_Store
 ._*
-Thumbs.db
 .cache
+.DS_Store
+.idea
 .project
 .settings
 .tmproj
 *.esproj
-nbproject
 *.sublime-project
 *.sublime-workspace
-.idea
+nbproject
+Thumbs.db
 
 # Komodo
-*.komodoproject
 .komodotools
-
-# grunt-html-validation
-validation-status.json
-validation-report.json
+*.komodoproject
 
 # Folders to ignore
-node_modules
-bower_components
+/js/coverage/
+/node_modules/