Whitespace cleanup
Merge pull request #3 from martinthomson/whitespace

Whitespace cleanup