Update emacs conf submodule.
Merge conflicts.