Remove trailing spaces.
Align everything with spaces.
Merge pull request #114 from gdrooid/master

Indent everything with spaces