add couchdb support
Merge branch 'vangheem/master'
Cosmetics for Issue #2253