More import fixes, now the code seems to work with Django 1.7.