Converts disease identifiers from enums to strings

Also include's yobbo's pull request to forestall merge conflicts.