Abstract Binstar token hiding to config, and use it in other places
Automatically get the binstar token from the binstar command line client

Fixes #854.
Use the channel_alias for the binstar channel token regex
Show the binstar username even when the url contains a token
Fix binstar token hiding for non-default channel alias
Use re.escape instead of replace('.', '\\.')
Never write Binstar tokens to file
Don't include the <TOKEN> bit in the canonical channel name
Merge branch 'master' into binstar-stuff

Conflicts:
	conda/install.py
Remove debug print
Handle channel being None
Avoid printing the Binstar token in any error message
Update CHANGELOG
Move minimal_satisfiable_subset to the logic module
Add an extra newline for readability
Try out minimal satisfiable subset algorithm that finds random subsets

It doesn't seem to help much in every case, although in some cases it helps a
lot.
add release date to changelog
Improve algorithm in minimal_unsatisfiable_subset to use a binary search

Unfortunately, we had to go back to dots instead of progress bars, because we
can't know how many iterations it will take.
Add XXX comment
Merge branch 'master' of github.com:conda/conda