Apologies for the poor formatting of my last message, and also for the
dirty patch. Please review this patch instead, it's cleaner.

Also, it should be noted that this patch isn't a complete solution;
the real problem is that the start-menu shortcut that's pinned to the
taskbar doesn't have the correct AppID embedded. But this patch will
ensure that emacs and emacsclient(w) will stack while they're running,
and gives us a string to match when modifying that shortcut.

-- Ben