Update templates still using old block names
Merge branch 'feature/VUMIGO-202-integrate-base-template' of github.com:praekelt/vumi-go into feature/VUMIGO-202-integrate-base-template

Conflicts:
	go/conversation/templates/generic/show.html