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?)
We normalize the cell dict before returning it, and any normalization failure will drop the entry.