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('.', '\\.')
supports unix-style prefix paths in regular text files on windows
continue to replace prefix_placeholder with standard os paths
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
next version 3.6.3
Update CHANGELOG
Merge branch 'master' of github.com:conda/conda
Merge pull request #886 from ddale/prefix-path-text

supports unix-style prefix paths in regular text files on windows
Update CHANGELOG
add release date