Fixing schemas to point the right way.

The previous commit re-introduced some deprecated data errors - these have been corrected and brought into line with how the schema should look.
Merge branch 'renewals' of github.com:dchbx/cv into renewals