Apparently, somewhere in here I blew away my emacs submodule? Put it back.