Updated Berkshelf to 3 format and updated  Genfile.lock