Beta2

Adds the ability to remove overlapping Contaminations (and thus overlapping Contacts) to the same infection in the same individual.

Some other cosmetic clean-up.