Travis improvements
Merge pull request #2 from GrahamCampbell/travis

Travis Improvements