Bring .travis.yml up to speed with master.