Return URL::base() if S3 is not active
Merge pull request #69 from oliverds/master

Return URL::base() if S3 is not active