Better env switching

[BaderBC]

Currently when you're switching between environments, the old one is being reverted, then second applies.

The problem is that in situation when env 1 makes the same changes as env 2, that file will be reverted despite reverting it is unnecessary. It applies not only to files but also to packages, which is the biggest problem.