Change the semantics of activate and deactivate

Now you cannot activate twice, and you cannot deactivate unless you first
activate.  Furthermore, activate takes exactly one argument (so activating the
default environment is no longer possible), and deactivate takes no arguments
(it always deactivates the activated environment).

This fixes #146.
Merge branch 'master' of github.com:ContinuumIO/conda