Have travis only build master
Merge branch 'master' into tx