Ensure default_configuration_dir points to right place.  Plus lots of PEP8