Cleaned up imports. (Removed unused django.utils.text.truncate_words import with doesn't exists anymore in Django 1.6)
Merge update for django 1.6