Updating to use berkshelf 3