Merge branch 'dev' into dev

Author: CNFeffery

.circleci/config.yml

@@ -12,7 +12,8 @@ charset = utf-8
 indent_style = space
 indent_size = 4
 
-# Matches the exact files either package.json or .travis.yml
+# Matches the exact files either package.json or .circleci/config.yml
 [{package.json,.circleci/config.yml}]
 indent_style = space
 indent_size = 2
+

.editorconfig

@@ -1,3 +1,3 @@
 # These owners will be the default owners for everything in
 # the repo. Unless a later match takes precedence
-* @alexcjohnson @T4rk1n @ndrezn @gvwilson @emilykl
+* @T4rk1n @ndrezn @gvwilson @emilykl