added friendly_id to User model, rails now logs custom 500 errors
changed description on rspec test
Merge pull request #166 from yggie/develop

Added friendly_id to Users
Merge pull request #167 from AgileVentures/develop

Deploy to staging