Undo whitespace damage to existing code
Remove trailing whitespace which breaks build
Strip trailing whitespace from changes
Merge pull request #2 from ojwb/tfidf

Tfidf whitespace-related fixes