add cedet, elpa, ess
fix merge