update for merges
Merge pull request #1486 from opscode/mcquin/merges-06-11-2014

update for merges