Update migration to fix most of the foreign keys including adding
constraints to the proposal.

Apply same changes to code that has already been fixed in previous
commits.
TODO look through other queries involving the same tables before putting
this live.

Sorry for whitespace checkin, I didn't manage to configure my Atom
correctly :(