Added ediff mode sane settings
Merge branch 'master' of github.com:pmallappa/dotemacs