Merge branch 'master' into templatemove

[ikiwiki] / template-transition-notes

* add_templates option removed from underlay plugin
  (can use add_underlays instead)
* includes no longer allowed in templates
* template_params removed (not exported API)