narrowcast and multisig changes
Merge branch 'master' of https://github.com/jl777/btcd

Conflicts:
	src/main.cpp