Updates to documentation

Update conflict resoution documentation to make it clear that
CDTMutableDocumentRevisions can be returned in conlfict resolvers.
Merge pull request #67 from cloudant/35676_update_docs

Updates to documentation