Renamed, changed calculations for models, loaders

Changed models and loading to make percent and per capita easier to work with
and ran a few migrations.
Fix some errors in loading, migrated data.

There were issues with syntax and formatting errors in the loading
scripts that I corrected in this commit.
Edited Algorithms to work with the new models.
Changed tests to work with new models