Merge pull request #234 from timwindsor/PluginRegistration

Plugin registration updates