Whitespace cleanup

Removes trailing whitespace on blank lines that would make future
merges confusing.
Merge pull request #2 from tmcw/whitespace-cleanup

Whitespace cleanup