default_options and override_options may now be dictionaries

Instead of passing them as default_options : ['key=value'], they can now be passed as default_options : {'key': 'value'}, and the same for override_options.