Give special error message if binstar tokens are expired
Merge branch 'master' of github.com:conda/conda