Merge branch 'master' into strict_type_predicates

.gitignore

@@ -16,3 +16,6 @@ typings/.basedir.ts
 # vim swap files
 *.swo
 *.swp
+
+docs/_data/rules.json
+docs/rules/

README.md

@@ -247,7 +247,7 @@ const files = Linter.getFileNames(program);
 const results = files.map(file => {
     const fileContents = program.getSourceFile(file).getFullText();
     const linter = new Linter(file, fileContents, options, program);
-    return result.lint();
+    return linter.lint();
 });
 ```
 

circle.yml

@@ -4,10 +4,11 @@ general:
       - gh-pages
 dependencies:
   pre:
-    - case $CIRCLE_NODE_INDEX in 0) nvm use 4.2 ;; 1) nvm use 5.7 ;; 2) nvm use 6.1 ;; esac
+    - case $CIRCLE_NODE_INDEX in 0) nvm use 4.2 ;; 1) nvm use 5.7 ;; [2-3]) nvm use 6.1 ;; esac
 test:
   override:
-    - npm run verify
+    - case $CIRCLE_NODE_INDEX in [0-2]) npm run verify ;; 3) npm run clean && npm run compile && npm i [email protected] && npm run test ;; esac:
+        parallel: true
 deployment:
   npm-latest:
     # match semver tag (e.g. 3.12.7)