Switch to use ForeignKey for Organization parent.
tests restored after merging pull requests from mysociety
Merge branch 'make-parent-foreign-key'