Work on loading plugins. Still needs per-user enabling.
Merge fix.