Crear/merge/universe time rebased

This is #69 rebased, depends on #77 

Adds a dummy dependency to the collection so it updates whenever something changes in it.

Closes #41
(cherry picked from commit 5efb577ab2638826d84cfffef9ca7cc3c6bba9d0)

<!---
@huboard:{"order":11.5}
-->