Hand-merge of https://github.com/theodi/odi-chef/pull/4

Which was a bit wrong anyway