merge branch new-emacs-init