Merge "Ignore local.conf in root of repo"