CS fixes
Travis improvements
Merge pull request #530 from GrahamCampbell/master

Minor Improvements