Remove remaining nested berksfiles and include rubygems in the role cookbooks