added ssh-agent config
Merge remote-tracking branch 'upstream/master'