Making some changes to Emote output message.

Cleaning it up and preparing for doing emotes that are NOT in third
person.