chef community merges
Merge pull request #1478 from opscode/mcquin/community-merges

chef community merges