diff --git a/home/.nvim/nvimrc b/home/.nvim/nvimrc
index e7d97f5..b0791b7 100644
--- a/home/.nvim/nvimrc
+++ b/home/.nvim/nvimrc
@@ -6,7 +6,8 @@ nmap <c-s> :w<CR>
 vmap <c-s> <Esc><c-s>gv
 imap <c-s> <Esc><c-s>
 " }
-" map <F8> :TagbarToggle<CR>
+nmap q :bd<CR>
+map <F8> :TagbarToggle<CR>
 nmap <F2> :wa<Bar>exe "mksession! " . v:this_session<CR>
 " \\es Open vimrc in a new tab
 nmap <Leader><Leader>es :tabedit ~/.nvim/nvimrc <CR>
@@ -35,10 +36,10 @@ nmap <leader>sc :SessionClose<CR>
 " }
 
 " Ctrl-Enter in insert mode will append ';' to the line and insert a new line 
-imap <NL> <ESC>A;<CR>
+imap <NL> <ESC>A;
 
 " Ctrl-Enter in normal mode will jump to tag definition using cscope
-nmap <NL> :vert scs f g <C-R><C-W><CR>
+nmap <C-CR> :vert scs f g <C-R><C-W><CR>
 " Ctrl-? in normal mode will jump to tag references using cscope
 nmap <C-?> :vert scs f t <C-R><C-W><CR>
 
@@ -105,6 +106,7 @@ autocmd FileType java set foldmethod=indent
 autocmd FileType java set foldmethod=indent
 autocmd FileType html set foldmethod=indent
 autocmd FileType javascript set foldmethod=indent
+" autocmd FileType php set foldmethod=indent ft=php.html
 set noswapfile
 " }
 
@@ -222,7 +224,8 @@ set sessionoptions=blank,buffers,curdir,tabpages,winsize,resize,winpos
 
 
 " for JavaScript syntax checking {
-let g:syntastic_javascript_checkers = ['jslint']
+let g:syntastic_javascript_checkers = ['jshint']
+" let g:syntastic_javascript_checkers = ['jslint']
 " }
 
 
@@ -254,7 +257,6 @@ let Gtags_VerticalWindow = 1
 let Gtags_Auto_Update = 1
 let GtagsCscope_Auto_Load = 1
 
-
 " set lazyredraw
 " set ttyfast
 let g:sparkupNextMapping = '<M-K>'
@@ -268,6 +270,7 @@ let g:sparkupNextMapping = '<M-K>'
 "       \    }
 "       \}
 
+let g:mustache_abbreviations = 1
 
 "for Bundle {
 set nocompatible               " be iMproved
@@ -279,7 +282,7 @@ Bundle 'gmarik/vundle'
 " My Bundles here:
 "
 " original repos on github
-" Bundle 'tpope/vim-fugitive'
+Bundle 'tpope/vim-fugitive'
 Bundle 'Lokaltog/vim-easymotion'
 Bundle 'Lokaltog/vim-distinguished'
 Bundle 'rstacruz/sparkup', {'rtp': 'vim/'}
@@ -307,11 +310,12 @@ Bundle 'garbas/vim-snipmate'
 Bundle 'MarcWeber/vim-addon-mw-utils'
 Bundle 'tomtom/tlib_vim'
 Bundle 'nathanaelkane/vim-indent-guides'
-Bundle 'flazz/vim-colorschemes'
+" Bundle 'flazz/vim-colorschemes'
 Bundle 'vim-scripts/sessionman.vim'
 Bundle 'kien/ctrlp.vim'
 " Bundle 'leshill/vim-json'
 Bundle 'godlygeek/tabular'
+" Bundle 'marijnh/tern_for_vim'
 Bundle 'majutsushi/tagbar'
 " Bundle 'amirh/HTML-AutoCloseTag'
 Bundle 'tpope/vim-surround'
@@ -328,7 +332,7 @@ Bundle 'mustache/vim-mode'
 Bundle 'chrisbra/NrrwRgn'
 Bundle 'heavenshell/vim-jsdoc'
 Bundle 'vim-scripts/JavaScript-Indent'
-Bundle 'spf13/PIV'
+" Bundle 'spf13/PIV'
 " Bundle 'joonty/vim-taggatron'
 
 "Bundle 'git://github.com/vim-scripts/autoload_cscope.vim.git'
@@ -337,8 +341,13 @@ Bundle 'spf13/PIV'
 Bundle 'briancollins/vim-jst'
 Bundle 'vim-scripts/matchit.zip'
 Bundle 'harish2704/vim-snippets'
-Bundle 'vim-scripts/SyntaxRange'
+" Bundle 'vim-scripts/SyntaxRange'
 Bundle 'harish2704/gtags.vim'
+" Bundle 'mustache/vim-mustache-handlebars'
+Bundle 'vim-scripts/marvim'
+Bundle 'Shougo/vimshell.vim'
+Bundle 'Shougo/vimproc.vim'
+" Bundle 'terryma/vim-multiple-cursors'
 " Bundle 'vim-scripts/guicolorscheme.vim'
 " Bundle 'vim-scripts/CSApprox'
 " Bundle 'vim-scripts/adt.vim'
@@ -364,10 +373,9 @@ endif"
 " colorscheme mrkn256
 " colorscheme desert256
 " colorscheme 256-grayvim
-" colorscheme  jellybeans
+colorscheme distinguished
 " colorscheme devbox-dark-256
 " colorscheme lodestone
-colorscheme distinguished
 " set foldmethod=syntax
 " let javascriptfold=1
 let g:indent_guides_auto_colors = 0
diff --git a/home/.vimrc b/home/.vimrc
index 42b4ef4..b37afde 100644
--- a/home/.vimrc
+++ b/home/.vimrc
@@ -285,6 +285,7 @@ Bundle 'gmarik/vundle'
 " original repos on github
 Bundle 'tpope/vim-fugitive'
 Bundle 'Lokaltog/vim-easymotion'
+Bundle 'Lokaltog/vim-distinguished'
 Bundle 'rstacruz/sparkup', {'rtp': 'vim/'}
 " vim-scripts repos
 Bundle 'L9'
@@ -292,6 +293,7 @@ Bundle 'FuzzyFinder'
 " non github repos
 " Bundle 'git://git.wincent.com/command-t.git'
 " Bundle 'git://github.com/vim-scripts/YankRing.vim.git'
+Bundle 'git://github.com/maxbrunsfeld/vim-yankstack.git' 
 " Bundle 'vim-scripts/Auto-Pairs' 
 Bundle 'vim-scripts/DoxygenToolkit.vim' 
 " Bundle 'Raimondi/delimitMate.git' 
@@ -309,7 +311,6 @@ Bundle 'garbas/vim-snipmate'
 Bundle 'MarcWeber/vim-addon-mw-utils'
 Bundle 'tomtom/tlib_vim'
 Bundle 'nathanaelkane/vim-indent-guides'
-Bundle 'Lokaltog/vim-distinguished'
 " Bundle 'flazz/vim-colorschemes'
 Bundle 'vim-scripts/sessionman.vim'
 Bundle 'kien/ctrlp.vim'
@@ -318,9 +319,8 @@ Bundle 'godlygeek/tabular'
 " Bundle 'marijnh/tern_for_vim'
 Bundle 'majutsushi/tagbar'
 " Bundle 'amirh/HTML-AutoCloseTag'
-Bundle 'vim-scripts/AutoComplPop'
-Bundle 'git://github.com/maxbrunsfeld/vim-yankstack.git' 
 Bundle 'tpope/vim-surround'
+Bundle 'vim-scripts/AutoComplPop'
 " Bundle 'Shougo/eocomplcache'
 Bundle 'spf13/vim-autoclose'
 Bundle 'scrooloose/nerdtree'