Added a MatchList model to replace the MatchManager
Resolved issues with count() on querysets in custom functions