fix erc nick coloring, and get rid of a bugfix merged in trunk