Merge emacs.d tweaks.