Needed to move the Terminal stuff over to remoting, as I don't include the aux-apps in my Work-specific Emacs system. While I was at it, I noticed some key conflicts with org, so fixed that too.