Sync local_settings.py with Grizzly
Merge pull request #87 from vuntz/grizzly-conf

Sync local_settings.py with Grizzly