merge with upstream
rename ssh-agent
Merge branch 'master' of https://github.com/jck/prezto