21 and 22 are different from the original PR. 

This will mean having the GITHUB_HOOK_TOKEN unique per team - but I think that is something we'll want to do anyway.