Cleaned up CLI interface a bit. All seems to be working now.

--server would probably be better as a subparser but optional subparsers don't seem
to be possible in the python2 implementation of argparse. Might be easier when ported to 3.