Merge branch 'master' of git://github.com/tobig/clang_complete

Conflicts:
	doc/clang_complete.txt
	plugin/clang_complete.vim
	plugin/libclang.py