Improve an error message
Correctly handle an empty pinned file
Merge branch 'master' of github.com:conda/conda