[EC2 knife-cloud] merge Fog/Excon Error PR 

It includes PR's:
https://github.com/opscode/knife-ec2/pull/198
https://github.com/opscode/knife-ec2/pull/214

@muktaa