adding more data to be analyzed (hospitals and MAOs)
DRYing up code in prep for new data types (previous commit)