More updates, more vimrc cleanup