Merge sshkeys branch from Stephen and Mark