Rework regex in xx-Remove-emails#80

hlieberman wants to merge 2 commits intootwcode:masterotwcode/open-doors-code:masterfrom

hlieberman:masterhlieberman/open-doors-code:masterCopy head branch name to clipboard