Get travis working rebased