changed the collate worker to process all types per run
Merge pull request #672 from john-hill/collate-time

changed the collate worker to process all types per run