Applied the patch committed by cjacker (make clang_complete only one instance).
Merge remote-tracking branch 'refs/remotes/upstream/test'

And do some random clean-up.
The whole thing is a mess. :(

Conflicts:
	auto-complete-clang-async.el