Handle underscores in @mentions

Still strip @mentions with underscores.