Add json vim plugin
Merge from master