master
Updated travis config