Chefdk

Merging chefdk update back to master