sets up s3
Merge branch 'master' of heroku.com:mjdiaspora into develop