Add cli options for server host and port.  Clean up some comments.
Refactor configuration.