Merge travis config change to speed up the build