diff --git a/.gitmodules b/.gitmodules
index ea3f418..fb58bc4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -52,3 +52,6 @@
 [submodule "bundle/gocode.vim"]
 	path = bundle/gocode.vim
 	url = https://github.com/Blackrush/vim-gocode.git
+[submodule "bundle/json.vim"]
+	path = bundle/json.vim
+	url = https://github.com/leshill/vim-json.git
diff --git a/bundle/json.vim b/bundle/json.vim
new file mode 160000
index 0000000..3029554
--- /dev/null
+++ b/bundle/json.vim
@@ -0,0 +1 @@
+Subproject commit 3029554ee1619f478fc5222bf4c6c08909b1be9c
diff --git a/vimrc b/vimrc
index ede7e42..f1d8aa1 100644
--- a/vimrc
+++ b/vimrc
@@ -5,17 +5,17 @@ set encoding=utf-8
 call pathogen#infect()
 syntax on               "enable syntax hightlighting
 
-set nocompatible
-set modelines=0
-set visualbell
-set laststatus=2        "show 2 status lines
-set number              "show line numbers
 set autoindent          "enable autoindent
-set hidden              "enable multiple dirty buffers
-set encoding=utf-8      "set encoding
 set autoread            "automatically reload files
-set wildmode=full
+set encoding=utf-8      "set encoding
+set hidden              "enable multiple dirty buffers
+set laststatus=2        "show 2 status lines
+set modelines=0
+set nocompatible
+set number              "show line numbers
+set visualbell
 set wildmenu            "show autocomplete menu
+set wildmode=full
 
 colorscheme hybrid
 
@@ -30,22 +30,28 @@ endfu
 
 if has("autocmd")
     filetype plugin indent on
-    "Autoexit to normal mode after 15 seconds of inactivity
-    autocmd CursorHoldI * stopinsert
-    autocmd InsertEnter * let updaterestore=&updatetime | set updatetime=15000
-    autocmd InsertLeave * let &updatetime=updaterestore
-    "Automatically reload VIMRC file after saving
-    autocmd bufwritepost .vimrc source $MYVIMRC
-    autocmd bufwritepost _vimrc source $MYVIMRC
+    augroup InsertTimer
+        au!
+        "Autoexit to normal mode after 15 seconds of inactivity
+        autocmd CursorHoldI * stopinsert
+        autocmd InsertEnter * let updaterestore=&updatetime | set updatetime=15000
+        autocmd InsertLeave * let &updatetime=updaterestore
+    augroup END
+
+    augroup vimrc
+        "Automatically reload VIMRC file after saving
+        au!
+        autocmd bufwritepost $MYVIMRC source $MYVIMRC
+    augroup END
 
     "Mappings for diff mode
     autocmd filterwritepre * if &diff | map <leader>{ :diffget \\2<cr>| endif
     autocmd filterwritepre * if &diff | map <leader>} :diffget \\3<cr>| endif
 
-    "Custom mappings
 
     augroup javascript 
-        autocmd!
+        "Custom mappings
+        au!
         autocmd BufRead *.js nmap <leader>f* :call JsFunctionLookup()<cr>zz
     augroup END
 endif
@@ -130,3 +136,4 @@ nmap <leader>d :bd<cr>
 set wildignore+=*/Deploy/*,*/node_modules/*,*/build/*,*/lib/*
 
 set completeopt=longest,menu,menuone
+