Merge pull request #37 from ggear/graham-patch-CDH-13258

Update config to include more reasonable defaults