Overlapping django migrations between @ialbert email revamp and tracker branch