daemon messages
daemon: multiplexing
fix daemon timeout
rm dead code
add support for p2sh addresses to trezor plugin
Merge remote-tracking branch 'upstream/master'

Conflicts:
	plugins/trezor.py