Bring berkshelf specs up to the latest chef-zero
Merge pull request #589 from jkeiser/jk/chef-zero-latest

Bring berkshelf specs up to the latest chef-zero