Replace one `locate-library' by `featurep'
Add diff-hl in the packages to install at startup