Merge pull request #25 from dualsky/master

Reapply fix for highlighting users belonging to guilds