updated vimrc
added 2 new modules
updated nerdtree plugin
cleaned up merge conflicts and updated nerdtree