Added NERDTree back; small vimrc edits