Updated gemfile
Merge branch '2-2-stable' of https://github.com/annarbortees/annarbortees-spree into 2-2-stable