Modified vimrc to deal with new plugins, now using terminal vim.