Fix the URL references to annotations
Switched editing to use annotation data

This makes it easier to persist independently of the rest of the
database. We can even add privacy rules to filter annotations that we
want to make accessible, and tag them by author