Merge pull request #35 from SacNaturalFoods/master

changed `DisplayField.display_format` to 1-M, added formatting to totals
merge