add cedet, smartparens
Merge branch 'master' of github.com:tiensonqin/dotemacs

Conflicts:
	modules/editor.el
	recentf