Merge latest gavinandresen/bitcointools.