Updated template files to be in sync with emacsy repo.