Update upgrade_vim scripts and tigrc
Merge versions