Update submodules
Merge /home/paul/.vim

Conflicts:
	.gitmodules
	bundle/jedi-vim
	bundle/vim-airline
	bundle/vim-fugitive
	bundle/vim-markdown
	bundle/vim-snipmate
	bundle/vim-supertab
	bundle/vim-syntastic
	bundle/vim-tagbar