Auto merge of #208 - servo:jdm-patch-1, r=metajack

Use travis on the master branch



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/rust-layers/208)
<!-- Reviewable:end -->

Author: bors-servo

.travis.yml

@@ -10,8 +10,5 @@ before_install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.7 20; fi
 rust:
   - nightly
-branches:
-  except:
-    - master
 notifications:
   webhooks: http://build.servo.org:54856/travis