norman/friendly_id — pull request #302 by buddhamagnet (2012-06-24 11:20:59+00:00)
Title: Made conflict method more succint

Love this gem - this may be a minor improvement.

All tests passed.