Partially implement fix for south migrations when doing add_column.
Add test data for tests and a test for null keys.
Fix: null keys didn't match when merging.