Update Gemfile and remove lock

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

Change-Id: I496d6994902bc3b304d58956a18612473f8dda5b