Big clean-up of emacs config