Sync Travis CI configuration with master