Updated collision resolver to conform to changes in #24
Merge branch 'master' of github.com:thetron/mongoid_token