2 vim plugins and vmake updates and vmake update