Update email copy
add margin to 'cancel game' link on edit game view
pull in Donny's changes