Yes, use the above version, as it was just posted by Evan today as a bug fix, and the guide should be the same.

Both of you should make sure you do this with a remote wallet so you can keep your coins safely in "cold storage" (save the .dat file with the coins in it on a jump drive off line.  Keep it safe!)