Update travis config from master