Merge branch 'master' of https://github.com/mgechev/angular2-seed

* 'master' of https://github.com/mgechev/angular2-seed:
  Chore(deps): upgrade angular, typescript, zone.js. (#757)
  add cache and formatter (#748)

.travis.yml

@@ -1,31 +1,38 @@
 language: node_js
 node_js:
-- '4.0'
-- '4.1'
-- '5.1'
+  - 4
+  - stable
+
 sudo: false
-services:
+
 before_install:
-- npm --version
-- export CHROME_BIN=chromium-browser
-- export DISPLAY=:99.0
-- sh -e /etc/init.d/xvfb start
+  - export CHROME_BIN=chromium-browser  # Karma CI
+  - export DISPLAY=:99.0
+
 before_script:
-notifications:
-  email: true
-after_failure: cat /home/travis/build/mgechev/angular2-seed/npm-debug.log
+  - sh -e /etc/init.d/xvfb start
+  # - nohup bash -c webdriver-manager start 2>&1 &  # Protractor CI
+  - sleep 1  # give server time to start
+
+after_failure:
+  - cat /home/travis/build/mgechev/angular2-seed/npm-debug.log
+
 branches:
-  only:
-  - master
+  only: master
+
 notifications:
+  email: true
   webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/565e4b2fed3b96c1b964
+    urls: https://webhooks.gitter.im/e/565e4b2fed3b96c1b964
     on_success: change  # options: [always|never|change] default: always
     on_failure: always  # options: [always|never|change] default: always
     on_start: never     # options: [always|never|change] default: always
+
 env:
   global:
-  # https://github.com/DefinitelyTyped/tsd#tsdrc
-  # Token has no scope (read-only access to public information)
-  - TSD_GITHUB_TOKEN=9b18c72997769f3867ef2ec470e626d39661795d
+    # https://github.com/DefinitelyTyped/tsd#tsdrc
+    # Token has no scope (read-only access to public information)
+    - TSD_GITHUB_TOKEN=9b18c72997769f3867ef2ec470e626d39661795d
+
+cache:
+  directories: node_modules

package.json

@@ -95,23 +95,23 @@
     "tiny-lr": "^0.2.1",
     "traceur": "^0.0.91",
     "ts-node": "^0.7.1",
-    "tslint": "^3.7.1",
+    "tslint": "^3.7.0-dev.2",
     "tslint-stylish": "2.1.0-beta",
     "typedoc": "^0.3.12",
-    "typescript": "~1.8.9",
+    "typescript": "~1.8.10",
     "typings": "^0.7.12",
     "vinyl-buffer": "^1.0.0",
     "vinyl-source-stream": "^1.1.0",
     "yargs": "^4.2.0"
   },
   "dependencies": {
-    "angular2": "2.0.0-beta.14",
+    "angular2": "2.0.0-beta.15",
     "es6-module-loader": "^0.17.8",
     "es6-promise": "^3.1.2",
     "es6-shim": "0.35.0",
     "reflect-metadata": "0.1.2",
     "rxjs": "5.0.0-beta.2",
     "systemjs": "~0.19.25",
-    "zone.js": "^0.6.6"
+    "zone.js": "^0.6.10"
   }
 }