ENH: consistently compare pkg.canonical_name
Merge branch 'master' of github.com:ContinuumIO/conda