Oxfordshire location search improvements

In order to fix the search issues @mikejamesthompson raised in #508 I've added a `town` property to Oxfordshire's `disambiguate_location`, I've also fixed the `span` using the data from mapit.

This raises the question of whether `town` is actually the correct name for this parameter, but perhaps that should be a separate question.

Closes #508