More testing updates
Merge branch 'master' of github.com:opscode-cookbooks/chef-client
Merge branch 'master' of github.com:opscode-cookbooks/chef-client