modified auto complete and yasnippet
Merge branch 'master' of https://github.com/labinxu/.emacs.d

Conflicts:
	confs/yasnippet-conf.el