Updated S3 settings
Path fix
Use of django-s3-folder-storage
Another path fix!