diff --git a/.travis.yml b/.travis.yml
index 50a37d08a4..2bb09fee8b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: node_js
 sudo: false
 node_js:
-- '5.4.1'
+  - '5.4.1'
 
 branches:
   except:
@@ -18,32 +18,32 @@ before_cache:
 
 env:
   global:
-  # Use newer verison of GCC to that is required to compile native npm modules for Node v4+ on Ubuntu Precise
-  # more info: https://docs.travis-ci.com/user/languages/javascript-with-nodejs#Node.js-v4-(or-io.js-v3)-compiler-requirements
-  - CXX=g++-4.8
-  - KARMA_DART_BROWSERS=DartiumWithWebPlatform
-  # No sandbox mode is needed for Chromium in Travis, it crashes otherwise: https://sites.google.com/a/chromium.org/chromedriver/help/chrome-doesn-t-start
-  - KARMA_JS_BROWSERS=ChromeNoSandbox
-  - E2E_BROWSERS=ChromeOnTravis
-  - LOGS_DIR=/tmp/angular-build/logs
-  - SAUCE_USERNAME=angular-ci
-  - SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987
-  - BROWSER_STACK_USERNAME=angularteam1
-  - BROWSER_STACK_ACCESS_KEY=BWCd4SynLzdDcv8xtzsB
-  - ARCH=linux-x64
-  - DART_DEV_VERSION=latest
-  - DART_STABLE_VERSION=latest
-  - DART_CHANNEL=stable
-  - DART_VERSION=$DART_STABLE_VERSION
-  # Token for tsd to increase github rate limit
-  # See https://github.com/DefinitelyTyped/tsd#tsdrc
-  # This does not use http://docs.travis-ci.com/user/environment-variables/#Secure-Variables
-  # because those are not visible for pull requests, and those should also be reliable.
-  # This SSO token belongs to github account angular-github-ratelimit-token which has no access
-  # (password is in Valentine)
-  - TSDRC='{"token":"ef474500309daea53d5991b3079159a29520a40b"}'
-  # GITHUB_TOKEN_ANGULAR
-  - secure: "fq/U7VDMWO8O8SnAQkdbkoSe2X92PVqg4d044HmRYVmcf6YbO48+xeGJ8yOk0pCBwl3ISO4Q2ot0x546kxfiYBuHkZetlngZxZCtQiFT9kyId8ZKcYdXaIW9OVdw3Gh3tQyUwDucfkVhqcs52D6NZjyE2aWZ4/d1V4kWRO/LMgo="
+    # Use newer verison of GCC to that is required to compile native npm modules for Node v4+ on Ubuntu Precise
+    # more info: https://docs.travis-ci.com/user/languages/javascript-with-nodejs#Node.js-v4-(or-io.js-v3)-compiler-requirements
+    - CXX=g++-4.8
+    - KARMA_DART_BROWSERS=DartiumWithWebPlatform
+    # No sandbox mode is needed for Chromium in Travis, it crashes otherwise: https://sites.google.com/a/chromium.org/chromedriver/help/chrome-doesn-t-start
+    - KARMA_JS_BROWSERS=ChromeNoSandbox
+    - E2E_BROWSERS=ChromeOnTravis
+    - LOGS_DIR=/tmp/angular-build/logs
+    - SAUCE_USERNAME=angular-ci
+    - SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987
+    - BROWSER_STACK_USERNAME=angularteam1
+    - BROWSER_STACK_ACCESS_KEY=BWCd4SynLzdDcv8xtzsB
+    - ARCH=linux-x64
+    - DART_DEV_VERSION=latest
+    - DART_STABLE_VERSION=latest
+    - DART_CHANNEL=stable
+    - DART_VERSION=$DART_STABLE_VERSION
+    # Token for tsd to increase github rate limit
+    # See https://github.com/DefinitelyTyped/tsd#tsdrc
+    # This does not use http://docs.travis-ci.com/user/environment-variables/#Secure-Variables
+    # because those are not visible for pull requests, and those should also be reliable.
+    # This SSO token belongs to github account angular-github-ratelimit-token which has no access
+    # (password is in Valentine)
+    - TSDRC='{"token":"ef474500309daea53d5991b3079159a29520a40b"}'
+    # GITHUB_TOKEN_ANGULAR
+    - secure: "fq/U7VDMWO8O8SnAQkdbkoSe2X92PVqg4d044HmRYVmcf6YbO48+xeGJ8yOk0pCBwl3ISO4Q2ot0x546kxfiYBuHkZetlngZxZCtQiFT9kyId8ZKcYdXaIW9OVdw3Gh3tQyUwDucfkVhqcs52D6NZjyE2aWZ4/d1V4kWRO/LMgo="
   matrix:
     # Order: a slower build first, so that we don't occupy an idle travis worker waiting for others to complete.
     - MODE=dart
@@ -62,10 +62,10 @@ env:
 
 matrix:
   allow_failures:
-  - env: "MODE=saucelabs_optional"
-  - env: "MODE=browserstack_optional"
-  # Tracked in https://github.com/angular/angular/issues/7050
-  - env: "MODE=typescript_next"
+    - env: "MODE=saucelabs_optional"
+    - env: "MODE=browserstack_optional"
+    # Tracked in https://github.com/angular/angular/issues/7050
+    - env: "MODE=typescript_next"
 
 addons:
   firefox: "38.0"
@@ -105,34 +105,33 @@ install:
   - node tools/analytics/build-analytics success ci install
 
 before_script:
-- node tools/analytics/build-analytics start ci before_script
-- mkdir -p $LOGS_DIR
-- ./scripts/ci/presubmit-queue-setup.sh
-- node tools/analytics/build-analytics success ci before_script
+  - node tools/analytics/build-analytics start ci before_script
+  - mkdir -p $LOGS_DIR
+  - ./scripts/ci/presubmit-queue-setup.sh
+  - node tools/analytics/build-analytics success ci before_script
 
 script:
-- node tools/analytics/build-analytics start ci script
-- ./scripts/ci/build_and_test.sh ${MODE}
-- node tools/analytics/build-analytics success ci script
+  - node tools/analytics/build-analytics start ci script
+  - ./scripts/ci/build_and_test.sh ${MODE}
+  - node tools/analytics/build-analytics success ci script
 
 after_script:
-- node tools/analytics/build-analytics start ci after_script
-- ./scripts/ci/print-logs.sh
-- ./scripts/ci/after-script.sh
-- ./scripts/publish/publish-build-artifacts.sh
-- node tools/analytics/build-analytics success ci after_script
-- if [[ $TRAVIS_TEST_RESULT -eq 0 ]]; then node tools/analytics/build-analytics success ci job; else node tools/analytics/build-analytics error ci job; fi
+  - node tools/analytics/build-analytics start ci after_script
+  - ./scripts/ci/print-logs.sh
+  - ./scripts/ci/after-script.sh
+  - ./scripts/publish/publish-build-artifacts.sh
+  - node tools/analytics/build-analytics success ci after_script
+  - if [[ $TRAVIS_TEST_RESULT -eq 0 ]]; then node tools/analytics/build-analytics success ci job; else node tools/analytics/build-analytics error ci job; fi
 
 notifications:
   webhooks:
     urls:
-    - https://webhooks.gitter.im/e/1ef62e23078036f9cee4
-    # trigger Buildtime Trend Service to parse Travis CI log
-    - https://buildtimetrend.herokuapp.com/travis
-    - http://104.197.9.155:8484/hubot/travis/activity
+      - https://webhooks.gitter.im/e/1ef62e23078036f9cee4
+      # trigger Buildtime Trend Service to parse Travis CI log
+      - https://buildtimetrend.herokuapp.com/travis
+      - http://104.197.9.155:8484/hubot/travis/activity
     on_success: always  # options: [always|never|change] default: always
     on_failure: always  # options: [always|never|change] default: always
     on_start: false     # default: false
   slack:
     secure: EP4MzZ8JMyNQJ4S3cd5LEPWSMjC7ZRdzt3veelDiOeorJ6GwZfCDHncR+4BahDzQAuqyE/yNpZqaLbwRWloDi15qIUsm09vgl/1IyNky1Sqc6lEknhzIXpWSalo4/T9ZP8w870EoDvM/UO+LCV99R3wS8Nm9o99eLoWVb2HIUu0=
-