Refactored cohorts controller
Merge branch 'master' of https://github.com/slateapp/slate into sarahisasillysausage