Allow for passing options to custom plugins
Merge branch 'plugin_options'