Emacs conf updated
Merge done