Upgrade to berkshelf 3.x.x and omnibus 3