Various whitespace fixes

- Don't mix up tabs and spaces, this will lead to unreadable code
- Removed trailing whitespace
Merge pull request #494 from herwinw/whitespace_fixes

Various whitespace fixes