Cleanup vimrc and updated README