fix emacs init when ediff mode not present
Merge branch 'master' of github.com:shicks/config