Re-added userName functionality to friend. Left displayname
functionality in. Changed Merlin's commands to use our Person/Friend
instead of the temporary ones.