Update README.md
Update README.md
Added changes for template-file option
Added rspec tests for template file option
Merge pull request #72 from opscode/sid-template-file-option

Added changes for template-file option
Added missing bootstrap options
Added bootstrap-no-proxy option
Merge pull request #73 from opscode/sid-missing-bootstrap-option

[knife-cloud] Add missing bootstrap options to knife-cloud
Update README.md
Added changes to set ssh config by overriding winrm config
Implemented review comments to handle winrm bootstrap protocol for ssh_override_winrm case
Merge pull request #75 from opscode/sid-ssh-override-winrm-config

[knife-cloud] Common short options in ssh & winrm (SSH override winrm config)
knife-ec2 master to knife-ec2 knife-cloud sync
fixing vpc_mode issue
Added changes related to ssh_gateway configuration for bootstrap
Merge branch 'pd-ec2_sync_master' of https://github.com/opscode/knife-cloud into pd-ec2_sync_master

Conflicts:
	lib/chef/knife/cloud/chefbootstrap/ssh_bootstrap_protocol.rb
	spec/unit/ssh_bootstrap_protocol_spec.rb