Make sure values used in SCHOOL_PROGRAMME_MAP are valid
Filters now use SCHOOL_PROGRAMME_MAP
Merge branch 'develop' of github.com:torchbox/verdant-rca into develop