Simplifies the configuration file and command line. Signed-off-by: Robert Spencer <rspencer@lbsd.net>