Allowing both Charset & Collation

@dougwilson here's the change that allows specifying both charset & collation in the config, per our discussion. Feel free to change it if you'd prefer there only be one option `charset` for now rather than both `charset` and `collation` so as not to confuse things.