fix vimconf
Merge branch 'master' of https://github.com/seijiro/dotfiles

Conflicts:
	.vim/.vimrc.bundles