Merge branch 'master' of github.com:CloudStack-extras/knife-cloudstack

Conflicts:
	lib/chef/knife/cs_account_list.rb
	lib/chef/knife/cs_cluster_list.rb
	lib/chef/knife/cs_config_list.rb
	lib/chef/knife/cs_disk_list.rb
	lib/chef/knife/cs_domain_list.rb
	lib/chef/knife/cs_firewallrule_list.rb
	lib/chef/knife/cs_host_list.rb
	lib/chef/knife/cs_network_list.rb
	lib/chef/knife/cs_oscategory_list.rb
	lib/chef/knife/cs_ostype_list.rb
	lib/chef/knife/cs_pod_list.rb
	lib/chef/knife/cs_project_list.rb
	lib/chef/knife/cs_router_list.rb
	lib/chef/knife/cs_server_create.rb
	lib/chef/knife/cs_server_delete.rb
	lib/chef/knife/cs_server_list.rb
	lib/chef/knife/cs_service_list.rb
	lib/chef/knife/cs_template_list.rb
	lib/chef/knife/cs_user_list.rb
	lib/chef/knife/cs_volume_list.rb
	lib/chef/knife/cs_zone_list.rb
Merge branch 'master' of github.com:whitekid/knife-cloudstack