ami id is now an environment variable
Merge branch 'master' of ssh://github.com/CalculatedContent/chef-repo
corrected missing quotes around aws key id again