Include packages from setup.py develop in conda list (with use_pip)

Fixes #840.
Merge branch 'master' of github.com:conda/conda