Changes to constituency data import to include new data from Geoff

This isn't the tidiest pull request, I'm afraid, but the end result is that we
can successfully re-run the constituency data import and the new
constituency data from Geoff will be imported.  It also improves the name
matching, so that many more MP and MPL contacts are found.