Merge master into add-travis

Author: bradzacher

.gitignore

@@ -1,3 +1,5 @@
 node_modules
 yarn-error.log
 yarn.lock
+.idea
+.vscode

README.md

@@ -21,15 +21,13 @@ Add the following to your `.eslintrc` config:
 
 ```CJSON
 {
+  "parser": "typescript-eslint-parser",
+  "plugins": ["import"],
+  "rules": {
+    // turn on errors for missing imports
+    "import/no-unresolved": "error"
+  },
   "settings": {
-    "parser": "typescript-eslint-parser",
-    "plugins": [
-      "import"
-    ],
-    "rules": {
-      // turn on errors for missing imports
-      "import/no-unresolved": "error"
-    },
     "import/resolver": {
       // use <root>/tsconfig.json
       "typescript": {},