Removed trailing spaces.  Tabs converted to space.
Merge branch 'whitespace-cleanup'