bundle update sshkit
Merge branch 'master' into bootstrap