I'm just going to merge what I have. It's just the schema.rb, so it shouldn't hurt anything. We just need to figure out why it's still there (missing migration?) and get rid of it.