friendly_id
inferred slug
user slugs
Merge branches 'friendly_id' and 'master'