Changes to eventCondom

fire1 population now more general; risk threshold change to >= from >;
removed frivolous if statements
Condoms correctly accounted for in transmission
Fixed bug in prevalence calculation
Changed check for HIV positive