Topic/disease cleanup

Follow-up to pull request #299.

Should be just the 'good parts' from the prior branch.

I didn't touch it, but the 'resist' variable is more like a immunity penalty multiplier than a resistance value.  Labels left as-is to match the wiki page.