deis/deis — pull request #1101 by carmstrong (2014-06-02 22:54:44+00:00)
Title: 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.

TESTIING: rebuild and restart the router:

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

closes #1096, #1098