some xmpp debugging, some formatting fixes
Merge branch 'master' of github.com:cfstras/talkbox.js

Conflicts:
	xmpp.js