Final clean of DataFormatter
Merge branch 'master' of git@github.com:hicannon/LSCE.git