Make a warning a little more user-friendly
Merge branch 'master' of github.com:ContinuumIO/conda