Fix the test to use the correct websocket port
Disable logging in test again (oops)
Merge branch 'master' of github.com:buttercoin/buttercoin
Merge branch 'master' of https://github.com/RevCBH/buttercoin into RevCBH-master