Merge branch 'master' of github.com:puphpet/puphpet
aws is not defined outside the config.aws block

Fixes #969
Merge pull request #970 from davidfuhr/aws-tags

Fixes aws not defined error