replace composite_primary_key hack with django's unique together
6 files changed