That's the edition I have cited in the past, and I think the one that most people who have published in The Mark Twain Annual used. I think it is the most authoritative text--although the author of Flawed Texts and Verbal Icons might disagree. John Bird