Bump puppet-nginx for serveraliases support

Primarily for `serveraliases` support on all `nginx::vhost::*` defines. This
will also:

- Omit custom proxy log file.
- Add `X-Forwarded-*` headers to reverse proxied requests.
- Allow `Host` header forwarding to be optional.

https://github.com/alphagov/puppet-nginx/compare/c5737d68d24c48a644917544f1958279a58b9a19...4add1774203eaa2c9fde24ce4b2a385e46dae62d
Bump puppet-nginx for HTTP->HTTPS redirect

Principally for redirecting on `$host` instead of `$server_name`. Also
removes `upstream{}` blocks, using inline `proxy_pass` instead.

https://github.com/alphagov/puppet-nginx/compare/4add1774203eaa2c9fde24ce4b2a385e46dae62d...1a87dd9fb29f5f137e3d4ee42ddcf45c9054700e
Make servername always ci.alphagov

Make the Nginx primary `server_name` always be `ci.alphagov.co.uk` in all
environments (Vagrant and real). Additional hostnames are then appended as
server aliases - either for testing or transition.

In combination with the changes to puppet-nginx the redirect from
HTTP->HTTPS will preserve the hostname if the client has come in on a known
alias.
Merge pull request #6 from alphagov/fix_http_redirect

Fix HTTP->HTTPS redirect