added Cloud Foundry based options
Merge pull request #22 from jbayer/master

added Cloud Foundry based options