Added fixes for NERDTree and vim-airline