change zencoding-vim to emmet-vim
Merge branch 'master' of https://github.com/yysaki/dotfiles