Added time data service
Map now colours based on commits
Merged with upstream