Fix Travis PR testing to not overwrite the "master" that Travis creates with our "upstream master"