Minor cleanups, changed emacs encoding to a general encoding modeline.