Gave in and swapped back to vim-flavor