New JSON vim plugin
Switch from vimdiff to meld for merge tool.