Fix extra spaces around hyphens (and other tokens)
Merge pull request #41 from rbart/fixhyphens

Fix extra spaces around hyphens (and other tokens)