added emmet-vim
Merge branch 'master' of https://github.com/jon49/vim