General cleanup of all configuration files.  Better support for emacs in terminal.