Merthyr progress codes
Don't break on broken teacher link for timetables
Show error if view form config is borked
Merge branch 'merthyr' of https://github.com/sdc/leap into merthyr
Finally rid myself of the horrible hack to get affiliations from merthyr. Looks at headers as well as env variables for shib authentication.