Better travis branch handling