Fix the migration so that it runs

This is an old migration but having it running allows me to run the migrations
from scratch, which allows me to double check what the schema should look
like.
Update the schema based on recent migrations

Two recent migrations were added[1][2] without the updated changes to
schema.rb. This is the updated schema as it appears after running those
migrations.

[1] a61ec35e2a9660fd6f108771e2be81cb4b98444e
[2] ffeaacc020b4368c862e6c4169faa94ad15d9fff