Better Conversion support

ActiveModel::Conversion#to_key was shadowing our #to_key implementation. Fix
that.
Fix typos
Merge pull request #62 from outoftime/conversion

Fix conversion