Add option for running in Cloud Formation mode
fix merge for PR #80
Merge pull request #99 from coryb/codiverse-addCFtoConf

fix merge for #80