Created factory for one cohort.  Added cohort id to user factory.  Made index safe for users with no assigned cohort
Merge branch 'spec' into development