Update for Berkshelf 3

Also check for Berkshelf version.