Found a loose comma in cmsExtendedGeometryXML_cfi.py and removed it. Also updated .gitignore to ignore ~ files.