Rearrange Travis setup