Make the data migration faster

Instead of several minutes, this executes in a few seconds.
Merge pull request #602 from alphagov/faster-data-migration

Make the data migration faster