Support for enabling and configuring plugins
Cleaned up some of the configuration and formatting.