Replaced old references to model_builder in contacts.py and wham.py