-emacs-U is deprecated

Use -emacs instead in .dir-locals.el

I'm going to merge this directly, because it doesn't touch anything of real significance.