break AWS-specific stuff out into its own template
Merge pull request #165 from cloudfoundry/split-templates

break AWS-specific stuff out into its own template