Contact Models: new schema

This is a first pass at a new schema for the two contact models Agency and Office. In the interests of time, I've made the tests work - but will obviously spend a bit more time on fixing up the API. 

Let the comments roll.