Bring emacs up to date with current configs

Woops... haven't been maintaning this. Sorry for the
shitty commit future self.