Fix #8: Don't strip trailing blank chars
Fix #9: Work around fixed bug in thingatpt.el

Upstream bug report http://debbugs.gnu.org/15808