Add vim-json & Add update.sh && install.sh
Merge branch 'master' of http://github.com/fbentz/vim

Conflicts:
	install.sh