Fix package logic for different ruby versions, add Berkshelf