Changes to allow vagrant-aws provider

I couldn't get kitchen-aws working because of gem version incompatibilities, and actually found that I preferred this as it allows me to have different instances for dev and integration environments