Whitespace cleanup
Merge pull request #140 from GrahamCampbell/whitespace

Whitespace Cleanup