Initial import, updates for django 1.7