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

Tweaks