Update Emacs guide, reformat a bit