zsh
vim: comment macros

also submodule update