Allow database name to be configurable.
Allow port to be configurable.
Fix issue with config merge.