migrated User model with rails migrations
Merge branch 'master' into ryan