Update bundles and finetune vimrc