Final changes before merge

 * Updated Annotator to de4c0dfc (maintenance branch), which has
   typed anchors support merged. See https://github.com/hypothesis/annotator/pull/18
 * Final changes based on code review.