First stage on moving settings to a separate, untracked file
Merging with Sergio's contributions