Fix merging of STATE with percentile.trajectories and final merge of tmp.cuts and trajectories

Had duplicates in panel.data[["Panel_Data"]] where some kids had a
value for STATE in one year but not in others.  This may be a problem
in getPanelData.
Change how STATE is added to panel data.  id.var caused unwanted duplicates