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?)
Oh, yeah. I overlooked the normalized_cell_dict call at the end, sorry!