Rearranged gems to speed up Travis builds