Rearrange travis yaml file