Migrations

Re-fixed migrations. Migration order has been tested against a copy of production. All tests pass.