style cleanup.
Merge branch 'master' into efficientsocket
use dep that solves this
Merge branch 'efficientsocket' of github.com:freedomjs/freedom-social-xmpp into efficientsocket
newer method of serialization
serialize for reals
Merge branch 'master' of github.com:freedomjs/freedom-social-xmpp into efficientsocket
Invoke prepareSecure before starttls message, fix setSecure bugs with new node-xmpp, set domain to 'google.com' to fix gtalk cert errors
Update comment
Merge branch 'efficientsocket' of https://github.com/freedomjs/freedom-social-xmpp into efficientsocket
update comment
Set minimum chrome version to 38 for Google demo
Add TCP socket tests
Merge branch 'efficientsocket'
Update npm version
Merge branch 'master' into efficientsocket
Merge branch 'efficientsocket'
Merge branch 'master' of https://github.com/freedomjs/freedom-social-xmpp

Conflicts:
	Gruntfile.js