updating Gemfile.lock

:fork_and_knife: 

After fetching/merging `origin/master` locally, my `Gemfile.lock` had the following updates and wouldn't let me do anything without having these changes in place.  I'm guessing a lot of this is a result of https://github.com/opscode/supermarket/pull/792 being merged.

Does this seem kosher?