Use google diff-match-patch for fuzzy matching to make displaying
annotations a lot more robust.
Merge some updates from upstream annotator