Add emmet-vim
Merge branch 'master' into mac