More details for plugins; with code and stuff!  I think I can move on for now
Muerge up from master.