Merged gvimrc and vimrc, extensive updates to vimrc and updated README.