Tidy SetNickColour, fix unit test.
Merge pull request #303 from greboid/events

Tidy SetNickColour, fix unit test.