Change ssh config for email to use different ControlPath

otherwise the authorized_keys commands don't get run on the far end ...
Merge branch 'master' of git://github.com/foobacca/dotfiles

* 'master' of git://github.com/foobacca/dotfiles:
  zsh: new mux completion