Change env-vars to not overwrite already set vars

As requested in #153