Fix Gemfile / Berkshelf and a minor rubocop fix