Fix up cmdline a bit more.

Fixed some errors around messages for different arguments. Added
enforcement of required property: server. Fixed behavior where if you
provided an alias, it still required a server. More tests.