Merge branch 'dopair-vectorisation-merge' of gitlab.cosma.dur.ac.uk:swift/swiftsim into dopair-vectorisation-merge