put nick colouring code in a class
Started work on general event collapsing
Merge branch 'unstable'
Revert "Started work on general event collapsing"

This reverts commit a5643a4f8fba85d94b6c8cd54de35355f25e5dd0.