Merge pull request #99 from tmatilai/aws-0.4

Compatibility with vagrant-aws v0.4.0

backport of #99