Fix unicode issue

[TimWhiting]

Fixes: #458 & #457

There is more work to do to grapheme clusters completely correct, but this is a step in that direction.

See https://www.unicode.org/reports/tr29/#Grapheme_Cluster_Boundary_Rules for what needs to be done to support this properly.