Added a few extra programme and school mappings for show 2013
Staff index page template and model updates
Merge branch 'develop' of github.com:torchbox/verdant-rca into develop
Uncommented REF=TRUE check in research importer
added schools to programmes map to models.py
Make sure values used in SCHOOL_PROGRAMME_MAP are valid
Changes to student profile importer
Merge branch 'develop' of github.com:torchbox/verdant-rca into develop
Fixed bad migrations
Merge branch 'develop' of github.com:torchbox/verdant-rca into develop
Added migration for new field StudentPage.funding
Filters now use SCHOOL_PROGRAMME_MAP
Merge branch 'develop' of github.com:torchbox/verdant-rca into develop
Merge branch 'develop' into feature/twitter