Merged in Joe's django utilities changes