Various data formats to prep for reading AFT data from a file
Merge pull request #86 from eghm/master

Various data formats to prep for reading AFT data from a file