Merge pull request #18 from njam/aws

Add Amazon AMI builder
Merge branch 'master' of github.com:cargomedia/vagrant-boxes into aws-boxes