Rearranging build steps in Travis