This change is relatively incomplete -- ideally we could snapshot os.environ and /etc/environment at startup and respect key deletions too, but that's a lot more work. Wait for a bug report instead. Closes #338.
