nmap <ESC>b :NERDTreeFromBookmark
nmap <ESC>B :B
nmap <ESC>s :OpenSession
-nmap <ESC>m :q!<CR>
+"nmap <ESC>m :q!<CR>
+" We're closing the buffer instead of just the window to avoid slowness due to too many opened buffers
+nmap <ESC>m :bd<CR>
nmap <ESC>w :w<CR>
imap <ESC>n <ESC>:tabnew<CR>
imap <ESC>t <ESC>:NERDTree
imap <ESC>f <ESC>:wq<CR>
imap <ESC>c <ESC>:tabclose<CR>
"map <ESC>e <ESC>:tabclose<CR>
-imap <ESC>m <ESC>:q!<CR>
+"imap <ESC>m <ESC>:q!<CR>
+" We're closing the buffer instead of just the window to avoid slowness due to too many opened buffers
+imap <ESC>m <ESC>:bd<CR>
imap <ESC>w <ESC>:w<CR>
" Write, quit and close shortcuts using Alt-key combo notation