Cleanup emacs

Also update packages