Single cellID everywhere

Merged Whitney Armstrong requested to merge cellid into master

no longer using cellid0 or 1

Merge request reports