Merge remote-tracking branch 'iilyak/2561-make-config-API-consistent'

This closes #4

COUCHDB-2561