CS fixes
Minor travis improvement
Merge pull request #22 from GrahamCampbell/master

Minor Improvements