update gemfile to fix breaking dependencies
Merge branch 'master' of https://github.com/treznick/rails-wedding-rsvp