Tidy
Merge branch 'websocket-browser' of github.com:node-xmpp/node-xmpp-client

Conflicts:
	package.json
Merge branch 'master' of github.com:node-xmpp/node-xmpp-client
Merge branch 'master' of github.com:node-xmpp/node-xmpp-client

Conflicts:
	package.json
0.1.7
0.1.8