Fixed imports for django 1.6 compatibility