Commit from Mozilla Verbatim by user ibai@oihanguren.com.: 111 of 111 strings translated (0 fuzzy).
Fix up default settings for local niceness
Merge pull request #526 from kumar303/fix-settings

Fix up default settings for local niceness
Sync test settings with dev settings
Fix up settings for testing and local dev