Add multi-term and shell-pop for hacking with zsh in Emacs