merged bimbalaszlo/vim-mixed