update conda binaries info
Merge branch 'master' into staging

Conflicts:
	readme.rst