(#2848) Config options require '_', not '-'.

I mistakenly thought that our configuration file options could be used on the
command line with hyphens where underscores were present in the symbol; sadly,
this is not the case.

This updates the commits to reflect that, especially when we recommend options
to people.

Signed-off-by: Daniel Pittman <daniel@puppetlabs.com>