Replace tabs and spaces

There was a mix of tabs and spaces used for indent.
I replaced all tabs with 4 spaces.
Remove trailing spaces from end of lines
Merge branch 'whitespace'