Updating travis config
Updating to master