CS fixes
Travis tweaks
Merge pull request #8 from GrahamCampbell/develop

CS Fixes And Travis Tweaks
Merge branch 'develop'