Bug 283 import from ocid

Updates to cover initial review comments plus delta importing. Should be ready to start playing with real data now (hopefully?)
I'd also update any prior psc field with a potentially new value.