fixed User model, cleaned up Gemfile