Added
  Moved plugin docs - no changes.

  TODO: Improve these.
  Moved
  Reworded.
  Make a new plugins/ directory for each new site.

  Just for completeness really.
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into dev-macros