Add logging and better ssh agent support
Fix the ssh agent code still trying to use paramiko
Merge remote-tracking branch 'origin/master'