Extras / Sauce Connect

Support for extras. Currently the only extra is Sauce Connect, but this should be fairly extendable.

## Todos

- [x] Special timeout for running services (What should this be? Same as services?)
- [x] Tests

/cc @joshk