Fix travis builds for PRs and other branches