fix #661
Merge branch 'master' of git://github.com/spesmilo/electrum
json-friendly debug messages. fix #659
Merge branch 'master' of github.com:spesmilo/electrum into clean