add emmet
Merge branch 'master' of https://github.com/nfriedli/vim