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

This integrates the new flashlight, without MITM and with the ability to tunnel XMPP and other such protocol over CloudFlare.
That's almost identical to the circular dependency issue I was seeing with #1535 -- be interested to hear how you work through it