Reorg of cohorts and discussion topics
Excludes changes for always-cohort-inline-discussions (DOC-1077)
Merge pull request #48 from edx/carol/docs/DOC_cohorts

Reorg of cohorts and discussion topics