More consolidation of .emacs files.