add new section in changelog
Make find_executable find the actual executable, not conda-executable

This is the same find_executable() from conda-build except with an option to
not include the root prefix.
Only show the conda install binstar hint if binstar is not installed
Merge branch 'master' of github.com:conda/conda
Fix undefined variable