More vimrc cleanup and readme rewrite