remove alternative socket until updated node-xmpp is published
style cleanup.
Merge branch 'master' into efficientsocket