rearrange travis builds