Automatically switches between localhost and S3 for storage based on environment
Merge storage location based on environment with Eric's changes