Merge branch 'master' of https://github.com/Cheukyin/.emacs.d

Conflicts:
	site-lisp/auto-complete-clang
Merge branch 'master' of https://github.com/Cheukyin/.emacs.d