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
Bump src/gorouter/src/github.com/cloudfoundry/gorouter

Bump cloudfoundry/gorouter:
  Alex Suraci, Gregg Van Hove and Maria Shaldibina:
     Add varz to count Bad Gateway responses ( Travis created: https://travis-ci.org/cloudfoundry/gorouter/builds/11159953 )
Bump src/collector

Bump cloudfoundry/collector:
  Alex Suraci, Gregg Van Hove and Maria Shaldibina:
     Report router bad requests and bad gateways ( Travis created: https://travis-ci.org/cloudfoundry/collector/builds/11160283 )