Fixes for error message and domain attribute usage.
Merge branch 'enhanced' of https://github.com/nickryand/knife-ec2 into enhanced