Extra cases for the heuristic aligner
Splitting tokenisation out for consistency

Tokenisation will be needed for sentences where no AMR is provided, and
it should be consistent.