merge @paglias migrations into our one big migration, so I can run it
all at once when the time comes. Had to make some changes (will comment
no github)