Added Couchdb
Merge branch 'master' into magus