Update to latest from Mixpanel's repo

For the future we should talk about just pointing our submodule ref to Mixpanel rather than having our own fork.