Remove trailing whitespace

[jhasse]

[techtonik]

Before merging this I'd like to add a check for trailing whitespace to Travis.