django 1.4.6 + wheels
merging
clear out old stuff