Fixes errors running cook with chef-0.10.0

Removing conflict errors with chef-0.10.0