changed data file in LabelData.py, changed to just pickle list in getTestData (I think Joey did this already).
merged conflict in getData.py