Updates and small vimrc changes