fixed #427, thanks peter1000
minor Py3k fixes for conda build
update changelog
Merge branch 'master' of git://github.com/ContinuumIO/conda

Conflicts:
	CHANGELOG.txt