GH-7: Vim-Kaoriya turns on filetype at Vim startup
Merge branch 'kaoriya'