update
Merge branch 'master' of https://github.com/reayd/ec2-puppet-modules