Some minor updates (restart after countdown now that it is fixed, add
timelimit override 20 for CTF, etc)