Plugins override template 809

This should close #809, though Mike may want to tweak it.