major refactoring of .emacs