Change travis config
Merge travis fix