Changed Location & Calendar to check for constants in the settings file for which model to use, and made given models the default ones (only to be initialised if no other models are defined.)
Changed Location & Calendar to check for constants in the settings file for which model to use, and made given models the default ones (only to be initialised if no other models are defined.)

ithinksw/philo,ithinksw/philo