Once I finish merging the original multiwallet with bitcoin/bitcoin master, I'll merge this all in as well cleanly.