add ability to handle forms reusing an arbitrary doc's id

and fix tests
add tests for conflicting ids
Merge pull request #105 from dimagi/handle-conflicting-id

Handle conflicting