Wafer django 1.7

PRobably time to land this