Refactor 'dataType' field overriding

It was hard to test where it was previously added.
Merge pull request #39 from alphagov/allow-dataType-override

Refactor 'dataType' field overriding