Example configuration file and cleanup

Please enter the commit message for your changes. Lines starting