Modified from_csv, from_excel, to use new 6-column format. Modified to_csv to output correct data in new format.
Implemented new format for to_excel
minor touchups