Update includes based on the django 1.5 restructure