Fix up schema.rb to match state of migrations and db.