Un-fucking whitespace.
Merge pull request #1 from martinthomson/whitespace-cleanup

Cleaning whitespace