Whitespace fixes
Updated travis
Merge pull request #40 from GrahamCampbell/tweaks

Tweaks