Update odi content models

And use our fork of the govuk models, to get format validation working