BUG: Add whitespace scrubbing from sample name

Sample names are now scrubbed for trailing white spaces.

Fixes #609