Pushing latest - unsure what has gone in
Merge branch 'master' of github.com:lloydwatkin/xmpp-websockets-json