Changing names of totals in models
Adding back old totals for data migration
Migrating data into new total fields
Fixing errors created by changing model names
Merge branch 'master' into deploy