Using new way to override settings
Merge pull request #294 from johnsimons/PR5

Using new way to override settings