restore from xprv
Merge branch 'master' of git://github.com/spesmilo/electrum
estimate fee using number of outputs
Forward-merging changes from master

To make sure tests pass or fail with the latest code.