handle no .ssh
Merge branch 'master' into gfp