Update travis-ci config file to run travis
Merge branch 'master' into dev