fix deps for lockfile
Merge branch 'develop' into multisig

Conflicts:
	pip-requirements.txt
Merge branch 'multisig' of https://github.com/CounterpartyXCP/counterpartyd into multisig