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

Reverted back to using individual readability API calls because I
couldn't get multimedia-capture to work properly. In the meantime, I've
been working on ways to interact with the Kimono Labs APIs which could
be used as another source for scraping.