Require org-journal
Merge branch 'master' of http://github.com/PatternMatching/emacs.d

starting Lines starting with '#' will be ignored, and an empty message aborts

This merge is necessary to combine changes performed concurrently