Removes old vim-json plugin
Updates submodules
Merge branch 'master' of github.com:jeremykendall/vim

Conflicts:
	.gitmodules
	bundle/vim-fugitive