Adding proxy for images on S3
Merge branch 'pf-add-image-s3-proxy' of http://github.com/Khan/aws-config into pf-add-image-s3-proxy

Conflicts:
	caching-proxy/etc/varnish/default.vcl