* CONDA PETER1000: some addons/changes/improvements to conda
Merge pull request #2 from peter1000/testing

* CONDA PETER1000: some addons/changes/improvements to conda