Update Gemfile and remove lock

berkshelf 2.0.18 needed for Supermarket
Gem lock file not useful in master branch

Change-Id: I481f9c988f215c108d8086f6ad2a8fecfb30ce61