Merge pull request #2642 from opscode/btm/site_install_json

knife cookbook site install json support w/tests
Conflicts:
	spec/unit/knife/cookbook_site_install_spec.rb
Merge pull request #2649 from opscode/sersut/port-json

Merge pull request #2642 from opscode/btm/site_install_json