Switch to master branch of sshkit for better error logging
Merge branch 'master' into bootstrap

Conflicts:
	Gemfile.lock