Run ssh-agent iff it isnt running
Merge remote-tracking branch 'mac/mac' into mac