This is a temporary commit and will be squashed.

This adds a few tests, which currently fail, to the conflicts test suite.

In particular, I don't understand the sequence ordering of attachments.
testCreateConflict and testCreateConflictWithAttachment print out
a docs/revs JOINed table and the attachments table. I would expect the sequence
number for the attachment to be 2 and not 3 (in -testCreateConflictWithAttachment)

In addition, we should discuss -testResolveConflictWithAttachmentForRev2b. I expect
that if I choose the 2-b revision to be the winner, which shouldn't have attachments,
that my new winning revision contains no attachment.