Rearrange the Travis script a little.