Updated vundle
Merge branch 'master' of github.com:jdubie/dotfiles

Conflicts:
	vim/vimrc.vim-template