Merge branch 'master' of github.com:benbeltran/dotfiles

diff --git a/vim/bundle/vim-json b/vim/bundle/vim-json
new file mode 160000 (submodule)
index 0000000..4a0bb3e
--- /dev/null
+++ b/vim/bundle/vim-json
@@ -0,0 +1 @@
+Subproject commit 4a0bb3e186ec8938131f2c9debc85097e86a2b63