Killreported infections - from infectioncontrol branch
Reinsert episode/patient ids
Merge branch 'master' into extract
Switch upstream dependency.
knock upstream back to opat