Merge branch 'add-chef-environment' of github.com:cfortier2/packer into cfortier2-add-chef-environment

Conflicts:
	provisioner/chef-client/provisioner.go