removed all the underscores from the command-line/config names; old config files should continue to work; Fixes #1