Fix setting db options from manifest

The merge was incorrectly overwriting default db options. This fixes it.
Merge pull request #2 from travisp/master

Fix configuring database options from manifest