add missing commas
changed naming etc. to create a valid template.
update param names to match that used in template.
specifically set the AZ for RDS subnets, so we span at least 2 AZs.
Merge pull request #1 from huit/parrott

Fixes to get it to fully deploy.