Fix merge conflicts for user / address models

Run bundle update, rake db:migrate then rspec to make sure update was complete.