Included nerdtree and other small modifictations