Updated 'search' examples.
Use a nested context manager, instead of contextlib.nested

I didn't realize that conda itself doesn't need to support Python 2.6.
source activate fails sooner if the env doesn't exist

This fixes #206.
Fix error reporting of activate/deactivate when not sourced but executed
Merge pull request #207 from mika-fischer/master

Fix error reporting of activate/deactivate when not sourced but executed
typo
update changelog
Fixed link to conda builder docs
Merge pull request #210 from Juanlu001/conda-build-doc

Fixed link to conda builder docs
add recipe.json to conda package
fixed #199
Merge branch 'master' into win

Conflicts:
	conda/cli/activate.py
	conda/cli/main.py