Cleanup whitespace
Merge pull request #158 from GrahamCampbell/whitespace

Cleanup Whitespace