- Use the 'store' request property for getting annotations from the
  store without knowing exactly how. This will make it possible to
  run h but delegate to another store eventually.
- Use an AnnotationFactory and Annotation resource in the traversal
  tree to decouple the views and the model.
- Fix merge weirdnesses and divergences.