changed collision properties to require inputs to be different
Merge branch 'master' of https://github.com/GaloisInc/cryptol