Merge branch 'master' of https://github.com/conformal/btcnet

Conflicts:
	genesis.go