diff --git a/.travis.yml b/.travis.yml
index cb708f5456..cbed9c5f20 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,29 @@
+sudo: false
+
 language: go
 
 go:
-    - 1.4
-    - tip
+  - 1.4
+  - tip
 
 install: make updatedeps
 
 script:
-    - go test ./...
-    #- go test -race ./...
+  - go test ./...
+  #- go test -race ./...
+
+branches:
+  only:
+    - master
+
+notifications:
+  irc:
+    channels:
+      - "irc.freenode.org#terraform-tool"
+    skip_join: true
+    use_notice: true
 
 matrix:
-    allow_failures:
-        - go: tip
+  fast_finish: true
+  allow_failures:
+    - go: tip