Simplify ?describe template w/macros, make slightly easier to read... fix sp etc
Merge remote-tracking branch 'origin/master' into NEXUS-5755-kill-plexus-from-cfg