Support both 1.5 and master branches of django

Tests pass for both versions for me