[FIXED] Broken User deletion and merge

[Freddie Bingham]

admincp/user.php still refers to 'privatemessage' instead of pm. Also need to update killuser and merger user to deal with the new private message format as well as any other changes.