merge

Heroku, Amazon AWS Elastic Beanstalk and CloudFoundry configs