Merge branch 'master' of github.com:cagedmantis/emacs-dotfiles