Travis tweaks
Merge pull request #16 from GrahamCampbell/master

Travis Tweaks