Fix contacts scoping bug

The scoping of contacts to organisations was a bit screwy, meaning that all contacts were listed on `contacts#index`, regardless of the organisation they actually belonged to. This hasn't been an issue up to now as it's only HMRC that currently uses the app, but it's still broken nonetheless. Also tides up some of the factories to ensure they create sensible things.