Save private key; refactor CSR generation

Also Refactor a server_up? in client_cli_spec