merge
Merge branch 'master' of https://github.com/kmalloc/vim
spell check && p4 setting