Merge branch 'master' of github.com:kaelzhang/node-couch-db