Correctly associated fetched attachments with their revisions:

Key the atts HashMap by doc id and rev id
Merge pull request #49 from cloudant/conflicted-attachments-bug

Fix for 'conflicted attachments bug'