Bring back the Download code as before (and simplify the ssh key gen to ...

...be more like before)

For #232