Updates to match django 1.7 framework