Only restore PATH from ..deactivate

Fixes #542.
Merge branch 'master' of github.com:conda/conda