Reorgnized Main for Data

It now prints data in an easier-to-put-in-spreadsheet way and
accommodates more hash functions more easily.  I've also cleaned up the
TODOs.