Merge pull request #42 from cyrille-leclerc/master

Heroku, Amazon AWS Elastic Beanstalk and CloudFoundry configs
Merge pull request #14 from jmxtrans/master

merge