CS fixes
More fixes
Test tweak
Travis tweaks
Merge pull request #80 from GrahamCampbell/cs-fixes

CS Fixes