Update CLI to use same flags for command-line

[untergeek]

...as the singleton CLI

This should be great for Docker users to pass values as environment variables