More tidying of config files.
Upgrade scarf.