checking heroku stuff
changed production env for fog, missing c in access

changed development to be using s3 image upload
fixed merge conflicts, removed old env from aws