Upgrade to Django 1.6.

This reverts commit 2d5bdc17e7c1820acf9c0b24217de558186c7eb0.
use None to indicate no expiry for cache items
settings/altdev: fix up settings to match -dev.