Merged vim-pony