This change makes it so if a LocalSite's extra_data contains a

siteconfig key, we'll use it as an additional layer for diff settings.

This will allow those sites to override the global diff settings.

Ran unit tests.