[WIP] Extras

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