Merge branch 'KNIFE-364'

Conflicts:
	.gitignore
	Gemfile
	knife-ec2.gemspec
	lib/chef/knife/ec2_server_create.rb
	spec/unit/ec2_server_create_spec.rb