Updated to include vim-json, improved vundle-setup