changed all Figaro env to ENV, and also changed storage to Amazon S3
Merge branch 'master' into steve

Merge