Largish refactoring of .emacs.d