include some changes from mapper. Will merge mapper later today.
include some changes from mapper. Will merge mapper later today.

benoitc/couchdbkit,ghickman/couchdbkit,sirex/couchdbkit,ghickman/couchdbkit,benoitc/couchdbkit,sirex/couchdbkit,ghickman/couchdbkit,benoitc/couchdbkit