Make activate work with relative paths

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