Update .emacs file, fix minor annoyances.