Updated unique_together to include type

Should make no difference for normal usage, but for subclassing could make a big difference