Reapply fix for highlighting users belonging to guilds removed in ce4e7a2fc8.
Merge pull request #25 from dualsky/master

Reapply fix for highlighting users belonging to guilds