Made S2Geometry static, added coordinateForCellId, CoreData optimizations
Added XM to Scanner