Added journal shortcut to org-capture
Merge branch 'master' of github.com:mburrows/emacs.d