.emacs.d:org-mode settings
Merge branch 'master' of https://github.com/acidnote/dotfiles

Conflicts:
	.emacs.d/inits/50_howm-org.el