add pip-conda rosetta stone
Merge branch 'master' into rosetta-stone
Merge branch 'master' of https://github.com/conda/conda-docs into rosetta-stone
add pip/conda rosetta stone to commands.rst
Merge branch 'rosetta-stone' of https://github.com/conda/conda-docs into rosetta-stone