Tweaks to setup for travis.