Corrected JmpTos and BranchTos

According to s2.notes.asm, those need to end with a ' ' instead of a
':'.
Merge branch 'master' into MapMacros