Add name field to users
Merge branch 'master' of heroku.com:etsyd

This merge is required due to not able to push to heroku master somehow.