Fixed bogus word merge in english

Also, added a first unit test. Gotta start somewhere.

Fixes #8.
Merge remote-tracking branch 'origin/master'