Fix some minor typos
Merge branch 'master' of https://github.com/tas50/chef-1 into tball/contrib-pass
Contribution information for https://github.com/opscode/chef/pull/2382
Contribution information for https://github.com/opscode/chef/pull/2385