Merge stash.
Add smart-forward stuff.
Bring back handy kill-emacs-frame keystroke enabling us to not care
that we're using emacs daemon mode.
Whatever org.