convert from using s3cmdto awscli in preparation for adding redirects
Merge branch 'move-to-markdown' of https://github.com/dotcloud/docker into move-to-markdown