Tweaks to Travis-CI config

Please don't merge this until Travis says everything passes.