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

Whitespace Tweaks And Updated Travis