Switching to boxen-emacs (PR merged)