Change how env are handled in the CLI

[Mish Ushakov]

Should instead merge the variables from CLI instead of passing them to separate config option