Tweaks for .travis.yml

This should speed up travis-ci builds.