STUFF
Merge branch 'master' of git://github.com/hotgloupi/conf

Conflicts:
	prepare.sh
	vim/.vim/doc/tags
	vim/.vim/plugin/clang_complete.vim
	vim/.vim/plugin/libclang.py
	vim/.vimrc