Merge branch 'master' into umd_export

Author: Andy Hanson

.gitignore

@@ -9,12 +9,14 @@ test-args.txt
 \#*\#
 .\#*
 tests/baselines/local/*
+tests/baselines/local.old/*
 tests/services/baselines/local/*
 tests/baselines/prototyping/local/*
 tests/baselines/rwc/*
 tests/baselines/test262/*
 tests/baselines/reference/projectOutput/*
 tests/baselines/local/projectOutput/*
+tests/baselines/reference/testresults.tap
 tests/services/baselines/prototyping/local/*
 tests/services/browser/typescriptServices.js
 scripts/authors.js

.travis.yml

@@ -7,9 +7,33 @@ node_js:
 
 sudo: false
 
-os:
-  - linux
-  - osx
+env:
+  - workerCount=3
 
 matrix:
   fast_finish: true
+  include:
+  - os: osx
+    node_js: stable
+    osx_image: xcode7.3
+    env: workerCount=2
+  allow_failures:
+  - os: osx
+
+branches:
+  only:
+  - master
+  - release.2.0
+
+install:
+  - npm uninstall typescript
+  - npm uninstall tslint
+  - npm install
+  - npm update
+
+cache:
+  directories:
+    - node_modules
+
+git:
+  depth: 1