Update to latest Vundle.vim syntax
Merge branch 'master' of ssh://github.com/yerdle/dotfiles

Conflicts:
	vimrc