Make the config easier to override.

These are small, but necessary improvements. It allows users to pass in a custom config dictionary, which was intended in the previous pull request, but wasn't implemented correctly.