automatically rename question IDs whenever there is a conflict

+ a tiny bit of formatting cleanup
Merge pull request #182 from dimagi/slimer

automatically rename question IDs whenever there is a conflict