Bumps gems
Fixes Gemfile.lock
Adds a band-aid on an (unrelated) flakey spec
Merge pull request #18 from HouseTrip/gem-update

Gem update