Travis improvements
Attempted travis fix
Merge pull request #561 from GrahamCampbell/travis

Travis Improvements