few changes--
Merge branch 'master' of https://www.github.com/FabienCesari/EmacsConfig
CEDET added
Conflicts:
	emacs-config.el