Update TravisCI: build master, but omit OS X since I still haven't

simonspa · simonspa · commit 0b91e48ee064 · 2016-02-07T01:28:32.000+01:00
figured out what goes wrong on the Travis machine, somehow the compiler flags are selected wrongly... (cherry picked from commit bab681a)
diff --git a/.travis.yml b/.travis.yml
@@ -5,12 +5,11 @@ compiler:
 
 branches:
   only:
-    - v1.4-dev
+    - master
     - v1.5-dev
 
 os:
   - linux
-  - osx
 
 before_install:
   - $CXX --version
