Revert "Add missing quotation mark"
Merge pull request #1008 from conda/revert-1007-fix/typo

Revert "Add missing quotation mark"
conda update conda first

This should hopefully avoid the error with circular dependencies in older
versions of conda.
Merge remote-tracking branch 'conda/master' into fix/activate-deactivate-scripts
Adjust Windows.bat file to use startup/shutdown scripts