Added support for the s3_host_alias (needed to use Cloudfront)
Merge branch 'upstream/master' of github.com:jdurand/browsercms into jdurand-upstream/master