update for latest b4winckler fork of macvim