Don't actually pull this - I'm just submitting the PR to highlight the Flashlight changes

This integrates the new version of flashlight, without mitm and with the ability to tunnel XMPP traffic.