merge refactoring of the bootstrap->chef cookbooks
merge refactoring of the bootstrap->chef cookbooks

opscode-cookbooks/kickstart,chef-cookbooks/kickstart,chef-cookbooks/kickstart,cookbooks/oc-kickstart,opscode-cookbooks/kickstart