Updated emacs stuff