cleanup
Merge branch 'master' of github.com:oremj/puppet-aws