added some compatibility / convenience methods
fix merge conflict
Merge pull request #18 from cloudant-labs/compatibility

Compatibility