Merging in migration fixups branch

Established models for most of the data, along with associated specs and factories.