Contact now uses Organisation, removes Department

Also changing all the tests for the models and associated bits of non-view
or controller that touch contact.

Part of https://www.pivotaltracker.com/story/show/67487248