Ensure default_configuration_dir points to right place.  Plus lots of PEP8
Merge pull request #61 from mhvk/configuration-location

Ensure default_configuration_dir points to right place.  Plus lots of PEP8