typo
Merge branch 'master' of github.com:Binstar/docs.binstar.org

Conflicts:
	content/channels.html