Import more stuff from deploy-chef