Fix for the display of "unknown participant"

From the bitlbee wiki: Since the server sends wrong JIDs for the
"from" field (123456_chat_name@conf.hipchat.com/real name here),
all you can do is using client scripts to fix this up
Fixed .vimrc merge error