move to vundle
Merge branch 'master' of github.com:hotgloupi/conf

Conflicts:
	vim/.vim/bundle/cSyntaxAfter