Updated to the new version of Annotator with some upstream fixes.

It also makes anchors and highlights plugins so it allows future
improvement on how we do anchoring and highlighting.