add s3 configuration
update config file
Merge branch 'master' of heroku.com:secret-ravine-5216