Merge branch 'master' of ssh://github.com/freeo/vim-kalisi