Update settings.php with support for facebook and timezone.

Merge