Cleaned indentation
use multisite upload path as prefix on s3
Merge branch 'multisite-path'