Ensure .env is always written, and expanduser so the dang files are found/created correctly.
Whitespace injection fixes. Now preserves trailing spaces after overrides, among other things.