fixd ediff colors
added eproject
updated dev
Merge branch 'master' of github.com:jagguli/dotemacs