Support Django 1.6
Update file names and manage.py contents for Django 1.6