TODO: (with a colon) is a watchword
Merge branch 'emacs-d-rework' of github.com:ddillinger/dotfiles into emacs-d-rework