Fix lookup to work with only 2 args
Merge branch 'dborkan-tls-and-facebook' of https://github.com/freedomjs/freedom-social-xmpp into dborkan-tls-and-facebook