Remove duplicate test function
Fix activate tests for nosetests

Apparently naming a variable "setup" is a no no.
Merge branch 'master' of github.com:conda/conda