Diff env settings impl; Fixup gitignore