Swap 'i' and 'k' in the terminology for account and keypair.
Merge branch 'bip32' of ..\brainwallet.github.com