Update to capture-templates.el and general-org.el

Partial update to allow capture templates to use information from the
readability API via org-protocol. Only REFERENCE currently works,
everything else needs to be updated.