fix(registry): fix S3 config options

This fixes two S3 settings that were not being properly set.
Changes proposed by @aledbf

closes #1065, #1066
Merge pull request #1073 from deis/fix_s3_template

fix(registry): fix S3 config options
fix(contrib): check that coreos/user-data has a discovery_url set