Update template

This just updates a couple of files taken from the affiliated package template. There are 42 commits that I think I just have to include otherwise they will re-appear in future PRs. What matters is that only two files are changed.

@eteq - is it normal that all the old commits are included? Do you think they were badly merged in the past?