Clean up vimrc and add some new plugins