Added alias ef to ediff two files.
Merge branch 'master' of https://github.com/MrXcitement/emacs