Minor simplification to Travis CI config