Improved travis testing
Minor cs fixes
Merge pull request #26 from GrahamCampbell/fixes

Minor CS Fixes
Merge pull request #25 from GrahamCampbell/travis

Improved Travis Testing