Update settings to match Django 1.4.10
Update settings to match Django 1.5.5