Fix conda convert to work on Python2
Merge branch 'convert' of github.com:pydata/conda into convert