Add uniquify to emacs
Merge branch 'master' into desktop