[Fix #477] Add instructions for updating Prezto
[Fix #479] Start only one ssh-agent instance
Merge remote-tracking branch 'upstream/master'
Add env vars for building CSM