This makes a hwole bunch of changes.  Some are stylistic, some make
terminology more consistent, some fix mistakes, and some specify
configuration parameters.

We need a cipher string for the TLS connection too.  Also, the client
needs several settings that I had only listed for the server.