Added support for vim-flavor and VAM