Change to use own forks of vim-flavor and vspec