s3 images
Merge pull request #772 from code-dot-org/s3image

s3 images