Add some more help to conda config
Merge branch 'master' of github.com:conda/conda