upgrade to django 1.6, fixed quite a few deprecated usage and other things:
1. dealing with deprecation
from django.utils.hashcompat import md5_constructor
=>
import hashlib and use hashlib.md5

from django.contrib.localflavor.us.models import PhoneNumberField
=>
from localflavor.us.models import PhoneNumberField

    'django.contrib.markup’,
=>
    'markup_deprecated’,

    host = get_host(request)
=>
    host = request.get_host()

from django.conf.urls.defaults import url, patterns, include
=>
from django.conf.urls import url, patterns, include

{% url home %}
=>
{% url ‘home’ %}

import simplejson as json
=>
import json

direct_to_template
==>
 TemplateView.as_view

2. upgrade packages and add new ones:
Django==1.6
South==0.8.4
celery==3.1.5
django-nose==1.2
django-extensions==1.2.5

django-localflavor==1.0
django-markup-deprecated=0.0.2

3. south migration issues

add:
from south.modelsinspector import add_introspection_rules
add_introspection_rules([], ["^localflavor\.us\.models\.PhoneNumberField"])

4. request transaction mode:
DATABASES['default']['ATOMIC_REQUESTS'] = True

5. simplejson is not longer used for internal serialization. python json is used instead. it breaks out code where a django form is serialized in session. have to re-implement the passing form in session.

6. re-initialize south migrations to start from a clean slate

7. fixed couples of pylint errors
update the user/profile model for django 1.6, streamline the profile admin into one place in user admin. all user.get_profile() becomes user.profile
fixed deleting team cause user not able to login, auto create the profile with default value from user.
check game enable status for management tasks in the scheduler
Merge branch 'master' of http://github.com/csdl/makahiki into django-1.6-migration
try runserver for heroku
upgrade gunicorn
Adding environment variable MACHINE_IS_VAGRANT to makahiki_env.sh, to be used by settings.py to set the allowed URLs for the virtual machine.
Removed "MACHINE_IS_VAGRANT = True" line left over from testing.
doc/installation-makahiki-vagrant-configuration-vagrant.rst: Added note on change to settings.py and ALLOWED_URLs after upgrade to django 1.6.
makahiki/settings.py: Added localhost and 127.0.0.1 to ALLOWED_HOSTS - not tested on Heroku yet.
Merge pull request #580 from jtakayama/django-1.6-migration

Vagrant ALLOWED_HOSTS fixes for Django 1.6 upgrade.
doc/installation-makahiki-vagrant-eclipse.rst: Fixed improperly closed plaintext area in section "Copying Makahiki Dependencies to the Shared Directory."
doc/installation-makahiki-vagrant-eclipse.rst: Added inline formatting for directory paths in section "Copying Makahiki Dependencies to the Shared Directory."
doc/installation-makahiki-vagrant-eclipse.rst: Added inline formatting for directory paths in article.
doc/installation-makahiki-vagrant-eclipse.rst: Added inline formatting for directory paths in article.
doc/installation-makahiki-vagrant-eclipse.rst: Added inline formatting for directory paths in article.
doc/installation-makahiki-vagrant-eclipse.rst: Added inline formatting for directory paths in article.
fix sphinx for django 1.6 autodoc
Merge branch 'master' of http://github.com/csdl/makahiki into django-1.6-migration