Fix a bug in conda skeleton pypi --version
Merge branch 'master' of github.com:ContinuumIO/conda