Update check_install with new install options
Fix default
Merge branch 'master' of github.com:conda/conda