Various changes, mostly surrounding recent emacs.d updates