add multi-term config for when it's unbroken, remove --cocoa from the emacs build