Change to env var restoration in activate script

Change to direct removal of the pre-known addition from $PATH and
$MANPATH
Merge pull request #58 from sanmiguel/improve-deactivate

Change of env var restoration mechanism in activate script