Upgrade to Berkshelf 3