Update docs regarding no_softlink and no_link
Should be no_link, not no_softlink
Document CPU_COUNT variable
Fix scrape_help.py for Python 2 compabitility and remove unused import

Fixes #25.
Note where to cd to in the README

Fixes #25.
Redirect stderr to stdout when checking conda version in scrape_help.py

See #25.
Remove conda workarounds from scrape_help.py now that 3.7.2 is out

Fixes #26.
Merge branch 'master' of github.com:conda/conda-docs

Conflicts:
	docs/scrape_help.py
Empty commit
Only deploy the docs on master
Merge branch 'master' into rosetta-stone