Emacs: Clean up custom.el
Emacs: Use upstream slime-company

Also update the .gitmodules file to the new directory structure.