update deps
Merge branch 'master' of github.com:freedomjs/freedom-social-xmpp

Conflicts:
	package.json
Merge branch 'master' of github.com:freedomjs/freedom-social-xmpp
v0.3.2