Significant amount of clean-up. Moved a ton of proprietary stuff into gitignored plugin.