Update Gemfile.lock for Heroku
Add validation and associations
Add validation and associations (again)