Vim: json plugin, mapping for syntastic toggle
basic merge

Merge branch 'master' of https://github.com/angelcarballo/dotfiles