Added json plugin for vim
Merge branch 'master' of git://github.com/peteches/configs

Conflicts:
	.gitmodules