update for merges
Merge pull request #1480 from opscode/mcquin/merges-06-10-2014

update for merges