Tidied vimrc and bundles