Document add_binstar_token option in .condarc
Merge branch 'master' of github.com:conda/conda-docs