Add support for S3 image hosting
Merge branch 'master' into images
Testing master + images together