Cosmetic/scalasyle fixes - no functional changes.

Eliminate all trailing spaces at end of line.
Merge pull request #282 from ucb-bar/scalastylefixws

Cosmetic/scalasyle fixes - no functional changes.