Yas and auto-complete
Merge branch 'master' of https://github.com/wuwei205/prelude

Conflicts:
	personal/wuwei-config.el