updated
Merge branch 'master' of https://github.com/ansterd/emacs
updated
yas, emmet