Cmckee/merit

Think I finally fixed schema problems.
I was gonna sit down with carlos and figure a much better way to solve the leader board queries.
As for points and badges across multiple classes and cohorts. I tested that a little bit. I dont think its pulling across though.