Merge branch 'knife-ssl-error-messaging'

Conflicts:
	spec/unit/knife_spec.rb
Use rspec-2 compatible assertion