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

CS Fixes And Travis Improvements