java setup cb added
Merge branch 'master' of github.com:Shoen/chef-repo