Merging the nginx configs for skyscape and amazon step 2
Merging the nginx configs for skyscape and amazon step 2

alphagov/govuk-puppet,alphagov/govuk-puppet,alphagov/govuk-puppet,alphagov/govuk-puppet,alphagov/govuk-puppet,alphagov/govuk-puppet