updated settings file so certain vars are actually overridden by local settings. updated local settings template