Update user.rb
Merge pull request #1 from joshcoughlan/patch-1

Update user.rb
Merge branch 'master' into stable