Updated .emacs, some more Nick changes primarily.