Refactored conflicter, added _ask() regression test
Merge pull request #216 from passy/collision-ask-test

Refactored conflicter, added _ask() regression test