pull upstream changes to zmq.ssh from IPython
Merge pull request #529 from minrk/ssh-upstream

pull upstream changes from IPython