Merge remote-tracking branch 'upstream/master'
Provide ehtml handler to capture org items.

Augment org-capture-templates to include an immediate-finish template
that can be invoked through a new web handler, jeff/capture-handler
written specifically to service incoming calls from entry.html via the
capture/KEY/LINK/TITLE/BODY form of url.
Merge branch 'master' of github.com:jeffkowalski/prelude