added journal back in for diary entries
Merge branch 'technomancy-v2-personalized' of github.com:karimofthecrop/emacs-starter-kit into origin-technomancy-v2-personalized