Merge pull request #48 from tswicegood/cleanup.

Move toward allowing disabling of plugins without removal