updated sinkfacility, enrichmentfacility and batchreactor to use new resource classes
removed unused includes. Fixed created generic resources to not be tracked
fixed null market bug where resource type was incorrectly compared
made dummy resources not be tracked
fixed untracked materials that should have been tracked. Other misc cleanups