Fix config files after change to aether
Merge branch 'master' into gwas