Tabs to spaces
Trailing whitespace
Merge pull request #2 from elia/ws

Trailing whitespace + tabs-to-spaces edition