Add --json to --help output
Merge branch 'master' of github.com:conda/conda