updates
Merge branch 'master' of github.com:hopstart/chef-testing