fix (or at least work around) #788
Merge branch 'master' of git://github.com/spesmilo/electrum
Add Trezor plugin settings - can now view ID and set device label
Confirmation count included in API command history
cosigner plugin update
Merge pull request #797 from Matoking/master

Add confirmation count to API command 'history'
fix broken test
fix broken test
fix tests
remove broken tests
fix load_wallet of cosigner
Merge pull request #789 from molecular/master

fix (or at least work around) #788
Merge pull request #794 from XertroV/trezor

Add Trezor plugin settings - can now view ID and set device label
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/tests/test_wallet.py
	plugins/cosigner_pool.py
	plugins/trezor.py