fix(registry): fix S3 config options

This fixes two S3 settings that were not being properly set.
Changes proposed by @aledbf

closes #1065, #1066
chore(contrib): Removed unused public port

The controller is now also listening on port 80.
fix(router): Fixes pushing to every router

Allow builder to be accessed by other all routers. Fixes #1083
Merge pull request #1087 from johanneswuerbach/patch-2

fix(router): Fixes pushing to every router
Merge pull request #1085 from johanneswuerbach/patch-1

chore(contrib): Removed unused public port
fix(router): Add configuration Ingress8000 in deis template for EC2

Routers are unable to communicate with remote controllers missing AWS::EC2::SecurityGroupIngress configuration for port 8000.
Merge pull request #1093 from smothiki/smothiki-fix-ec2-deis-template

fix(router): Add configuration Ingress8000 in deis template for EC2
fix(builder): decouple from controller

closes #1097
replaces #1089
fix(router): increase timeouts and survive controller/builder failures

Bumps the timeouts to 20 minutes and wraps the builder and controller
proxies in `if` clauses to prevent the router from crashing when
either controller or builder are restarted.

Also adds a generic health-check URL to be used for load balancers,
and an X-Deis-Upstream header.

TESTIING: rebuild and restart the router:

```console
	$ make -C router/ build restart
```

closes #1096, #1098, #1078, #1081
replaces #1080, #1057
Merge pull request #1073 from deis/fix_s3_template

fix(registry): fix S3 config options
Merge pull request #1102 from deis/decouple_builder_and_controller

fix(builder): decouple from controller
Merge pull request #1101 from deis/resilient_router

fix(router): increase timeouts and survive controller/builder failures
Merge branch 'master' of https://github.com/deis/deis

Conflicts:
	router/templates/nginx.conf