Retab, trim
Cleanup extra newlines
Spelling
Merge pull request #1 from mathias/retab_trim

Retab/trim, general cleanup, spelling