Updated vim config
Merge branch 'master' of github.com:b1nd/vimfiles

Conflicts:
	bundles.vim
	vimrc