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