Unshove allows rejoin if mistake made

Also fixes a bug with shoves lasting through games that were manually ended.