Fix typo
Hide the binstar token, and add a comment
Fix channel urls not showing with conda list, and remove the bare except that
was masking the bug
If binstar gives an authentication error, try without the tokens
Actually print the binstar authentication warning message
Always add dependencies of a package, even if the strictness is 3

This removes errors like

AssertionError: paramiko-1.14.0-py34_0.tar.bz2 MatchSpec('pycrypto 2.6.1')

and fixes conda/conda-build#205.
Update CHANGELOG
Mark conda init as deprecated
next version will be 3.7.0
Fix a comment in the tests
Revert "Always add dependencies of a package, even if the strictness is 3"

This reverts commit 3077dc15d2da7b33b512ad087181bd96e98f6b10.

This causes some serious performance regressions in some cases (conda create
-n anaconda python=2.7 numpy=1.6 takes 1:30 before this change and 7:30
after).
Remove reverted change from CHANGELOG
Merge branch 'master' of github.com:conda/conda
Don't run rd in the final try in rm_rf

Fixes UnboundLocalError.
rm_rf: On Windows, try removing readonly attribute in addition to rd /s
Don't try to check for error 5 in rm_rf

The WindowsError is 5, but the error in the exception can be different (like
13). Since we are already trying the removal several times, we might as well
try again unconditionally on Windows.
add release date