Some fixes
Merge branch 'master' of github.com:Simplicity-at-Source/muon-node

Conflicts:
	test/testMuonClient.js