.conf files now over-ride defaults in master.conf.
Master renamed to default.conf.  Added docstring.