clean up config file

[webstergd]

need to clean up the config file

[ms-xy]

we need to adjust some config keys, gateways configs should not have different keys for the same config values (master vs slave gateway config)