Add config option for S3 encryption, update config_sample.yml. Fix two typos in readme.
Merge branch 'master' of github.com:chasballew/docker-registry into chasballew-master
Fix conflicts