update master to use new bitcoind interface, get tests back online