Tourmatch

Added in a way to undo /nontourmatch

Also added in some other shortcuts... I haven't tested /tourmatch but if it looks good to you, I think it is good