changed s3 urls to using the folder convention
renamed s3 to s3_store
make sure we handle both s3 url formats
Merge pull request #1209 from ZogStriP/fix-s3-image-uploads-are-being-improperly-pathed

Fix s3 image uploads are being improperly pathed