Merge branch 'master' of github.com:steventlamb/emacs-customizations-personal