More vimrc tweaks, add nerdtree/yankring