diff --git a/.editorconfig b/.editorconfig
index 4228522f9d..ff0ad0433c 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -3,12 +3,12 @@
 root = true
 
 [*]
-indent_style = space
-indent_size = 2
-end_of_line = lf
 charset = utf-8
-trim_trailing_whitespace = true
+end_of_line = lf
+indent_size = 2
+indent_style = space
 insert_final_newline = true
+trim_trailing_whitespace = true
 
 [*.py]
 indent_size = 4
diff --git a/.gitignore b/.gitignore
index 465cdb4633..84d48d86e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,37 +6,37 @@ _site
 # 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
+*.komodoproject
 
 # grunt-html-validation
-validation-status.json
 validation-report.json
+validation-status.json
 
 # Folders to ignore
-node_modules
 bower_components
+node_modules