update for merges
Merge pull request #1493 from opscode/mcquin/merges-06-12-2014

update for today's merges