Update CHANGELOG
Merge branch 'master' of github.com:conda/conda

Conflicts:
	CHANGELOG.txt