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

Halting work for the evening. Currently media-capture is working. Still
need use readability API to retrieve the JSON object based on the URL.
From there it should be as simple as updating the capture templates.
The note template is what was used to expand %:link for testing.