Removed $q from TimeService

- removed $q from TimeService - was going to use an external service for
this, but ended up not needing it
- additional unit tests
- introduction of task grouping