Add missing HTML enities like ndash back and remove some trailing whitespace.
Merge pull request #55 from w0rp/master

Add missing HTML enttires back.