Address

This change converts the old Address mix-in which was becoming unwieldy to use because of the different use cases (must be present, must be absent, must be in England and Wales, etc) with an Address Class which is included by each of the models that need it.