Travis tweaks
Merge pull request #349 from GrahamCampbell/travis-tweaks

Travis Tweaks