Travis improvements
Merge pull request #82 from GrahamCampbell/master

Travis Improvements