The emacs config is dead. Long live the emacs config!
New emacs config
Merge branch 'master' into emacs-reboot