Update Django to 1.3.6 to address a security advisory

The 1.3.6 release of Django fixes a number of security issues
described in this blog post:

  https://www.djangoproject.com/weblog/2013/feb/19/security/
Merge branch 'master' into production